diff options
| author | Alexander Barkov <bar@localhost.localdomain> | 2015-05-26 11:59:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@localhost.localdomain> | 2015-05-26 11:59:17 +0400 |
| commit | 5bd25a9c530dc5d059f6153abf36639c0e213cb0 (patch) | |
| tree | 5b6a1439abc0a429804a156488a3c3b8e7d9dadb /sql/item_cmpfunc.cc | |
| parent | b3aece9b99c2d6c230725f8d1557b95e6bcffd80 (diff) | |
| download | mariadb-git-5bd25a9c530dc5d059f6153abf36639c0e213cb0.tar.gz | |
A helper patch for "MDEV-8228 Move Item_func_like out of Item_bool_func2"
- Changing Comp_creator::create() and create_swap() to return
Item_bool_rowready_func2 instead of Item_bool_func2, as they
can never return neither Item_func_like nor Item_func_xor
- Changing the first argument of Comp_create::create() and create_swap()
from THD to MEM_ROOT, so the method implementations can now reside in
item_cmpfunc.h instead of item_cmpfunc.cc and thus make the code slightly
easier to read.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 65d10608296..93e478892e0 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -264,66 +264,6 @@ static void my_coll_agg_error(DTCollation &c1, DTCollation &c2, } -Item_bool_func2* Eq_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_eq(a, b); -} - -Item_bool_func2* Eq_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_eq(b, a); -} - -Item_bool_func2* Ne_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_ne(a, b); -} - -Item_bool_func2* Ne_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_ne(b, a); -} - -Item_bool_func2* Gt_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_gt(a, b); -} - -Item_bool_func2* Gt_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_lt(b, a); -} - -Item_bool_func2* Lt_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_lt(a, b); -} - -Item_bool_func2* Lt_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_gt(b, a); -} - -Item_bool_func2* Ge_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_ge(a, b); -} - -Item_bool_func2* Ge_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_le(b, a); -} - -Item_bool_func2* Le_creator::create(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_le(a, b); -} - -Item_bool_func2* Le_creator::create_swap(THD *thd, Item *a, Item *b) const -{ - return new (thd->mem_root) Item_func_ge(b, a); -} - /* Test functions Most of these returns 0LL if false and 1LL if true and |