diff options
| author | gluh@gluh.mysql.r18.ru <> | 2005-02-04 15:31:36 +0300 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2005-02-04 15:31:36 +0300 |
| commit | 34915f7a91b7ba56f5bbb4ac6d6301f847a7d48b (patch) | |
| tree | bbb0e40bc45b0aa18e65ab56858a6d4d78bd8c06 /sql/item.h | |
| parent | 7213ca46add8cd1674c196851ef1073046ce03d5 (diff) | |
| download | mariadb-git-34915f7a91b7ba56f5bbb4ac6d6301f847a7d48b.tar.gz | |
A fix: bug#6931: Date Type column problem when using UNION-Table
bug#7833: Wrong datatype of aggregate column is returned
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 237a8f7efac..e0de7452eec 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1321,14 +1321,14 @@ protected: Item_result orig_type; Field *field_example; public: - Item_type_holder(THD*, Item*); + Item_type_holder(THD*, Item*, TABLE *); Item_result result_type () const { return item_type; } enum Type type() const { return TYPE_HOLDER; } double val(); longlong val_int(); String *val_str(String*); - bool join_types(THD *thd, Item *); + bool join_types(THD *thd, Item *, TABLE *); Field *example() { return field_example; } static uint32 real_length(Item *item); void cleanup() |