diff options
| author | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
| commit | e4cbbcf8a970b854bfbc34f77571afdb0b247814 (patch) | |
| tree | dff8e299e24252baed98de65a5a6435bbbfcf1c4 /sql/item_func.h | |
| parent | c2c760bdb60eaa22165b518c209381010d489604 (diff) | |
| parent | 17df0d648ca86d7074805228ba50d0f137b486d4 (diff) | |
| download | mariadb-git-e4cbbcf8a970b854bfbc34f77571afdb0b247814.tar.gz | |
Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql
into sunlight.local:/local_work/merge-5.1-opt-mysql
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/type_datetime.result:
Manually merged
mysql-test/t/type_datetime.test:
Manually merged
sql/item_cmpfunc.cc:
Manually merged
sql/item_cmpfunc.h:
Manually merged
sql/sql_insert.cc:
Manually merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index ea22e35773d..602c1c86f01 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -699,7 +699,8 @@ class Item_func_min_max :public Item_func /* An item used for issuing warnings while string to DATETIME conversion. */ Item *datetime_item; THD *thd; - +protected: + enum_field_types cached_field_type; public: Item_func_min_max(List<Item> &list,int cmp_sign_arg) :Item_func(list), cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg), compare_as_dates(FALSE), @@ -712,6 +713,7 @@ public: enum Item_result result_type () const { return cmp_type; } bool result_as_longlong() { return compare_as_dates; }; uint cmp_datetimes(ulonglong *value); + enum_field_types field_type() const { return cached_field_type; } }; class Item_func_min :public Item_func_min_max |