diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2009-12-10 10:31:52 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2009-12-10 10:31:52 +0400 |
| commit | c888a4a239afb952015d6cb4e661f6102c1189a6 (patch) | |
| tree | fb22cfa3d9fe097c23b8ea2c2b8a50856db76fe3 /sql/item_cmpfunc.h | |
| parent | 34c08c158c5dd9a7b6bc8ab982bfc5d5b2579a1c (diff) | |
| parent | 36e019c933f1842dc8cc534dbf5195a12dd99611 (diff) | |
| download | mariadb-git-c888a4a239afb952015d6cb4e661f6102c1189a6.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 52af6a31c0c..e2c070e2bdb 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1583,7 +1583,9 @@ class Item_equal: public Item_bool_func List<Item_field> fields; /* list of equal field items */ Item *const_item; /* optional constant item equal to fields items */ cmp_item *eval_item; + Arg_comparator cmp; bool cond_false; + bool compare_as_dates; public: inline Item_equal() : Item_bool_func(), const_item(0), eval_item(0), cond_false(0) @@ -1592,6 +1594,8 @@ public: Item_equal(Item *c, Item_field *f); Item_equal(Item_equal *item_equal); inline Item* get_const() { return const_item; } + void compare_const(Item *c); + void add(Item *c, Item_field *f); void add(Item *c); void add(Item_field *f); uint members(); |