diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-07 16:08:29 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-07 16:08:29 +0500 |
| commit | 3a04df06caaff7a0b58a1503f6294f15c7f38a63 (patch) | |
| tree | f21cce5dad5cad700f3c13fbe1ad23a29966856d /sql/item_func.h | |
| parent | 632e03f86dbc4cdcfcefb42bc8d47f59cd2d882d (diff) | |
| parent | e63cc253e2c0eb56c00d98dce583bb4d5baef49c (diff) | |
| download | mariadb-git-3a04df06caaff7a0b58a1503f6294f15c7f38a63.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 2d70f57d0e9..952c828b251 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -687,15 +687,23 @@ class Item_func_min_max :public Item_func Item_result cmp_type; String tmp_value; int cmp_sign; + /* TRUE <=> arguments should be compared in the DATETIME context. */ + bool compare_as_dates; + /* An item used for issuing warnings while string to DATETIME conversion. */ + Item *datetime_item; + THD *thd; + public: Item_func_min_max(List<Item> &list,int cmp_sign_arg) :Item_func(list), - cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg) {} + cmp_type(INT_RESULT), cmp_sign(cmp_sign_arg), compare_as_dates(FALSE), + datetime_item(0) {} double val_real(); longlong val_int(); String *val_str(String *); my_decimal *val_decimal(my_decimal *); void fix_length_and_dec(); enum Item_result result_type () const { return cmp_type; } + uint cmp_datetimes(ulonglong *value); }; class Item_func_min :public Item_func_min_max |