diff options
author | gkodinov/kgeorge@magare.gmz <> | 2007-07-18 15:56:29 +0300 |
---|---|---|
committer | gkodinov/kgeorge@magare.gmz <> | 2007-07-18 15:56:29 +0300 |
commit | f6225e20486ec17d86992973923db81511c2700e (patch) | |
tree | 41c1dde4a4218d15c8b9a50136bece1db3b96eaa /sql/item_cmpfunc.h | |
parent | bec9500ec074c0349868fc69504b71bd7fcee0fe (diff) | |
parent | 4f579b8d0e3e8bc3d8eb57eca7d3c656c77cb10b (diff) | |
download | mariadb-git-f6225e20486ec17d86992973923db81511c2700e.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index ee36aca069d..fcbacc32d88 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -42,6 +42,8 @@ class Arg_comparator: public Sql_alloc bool is_nulls_eq; // TRUE <=> compare for the EQUAL_FUNC enum enum_date_cmp_type { CMP_DATE_DFLT= 0, CMP_DATE_WITH_DATE, CMP_DATE_WITH_STR, CMP_STR_WITH_DATE }; + ulonglong (*get_value_func)(THD *thd, Item ***item_arg, Item **cache_arg, + Item *warn_item, bool *is_null); public: DTCollation cmp_collation; |