diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 16:48:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 16:48:56 +0200 |
| commit | ded128aa9b3d40775e626a08a744a93d9ba71b01 (patch) | |
| tree | 2abae3ef8fd5438fc99d269b47d645faec3cb8e8 /sql/item_cmpfunc.h | |
| parent | 64952203af161c6e72744b6a2fb8e0f5274ea4d6 (diff) | |
| parent | 259185764ba949bbe0cfa6bbef4673f61155cb90 (diff) | |
| download | mariadb-git-ded128aa9b3d40775e626a08a744a93d9ba71b01.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index b2938ee509c..9b20fa50214 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -3198,7 +3198,8 @@ public: bool excl_dep_on_in_subq_left_part(Item_in_subselect *subq_pred); bool excl_dep_on_grouping_fields(st_select_lex *sel); bool create_pushable_equalities(THD *thd, List<Item> *equalities, - Pushdown_checker checker, uchar *arg); + Pushdown_checker checker, uchar *arg, + bool clone_const); /* Return the number of elements in this multiple equality */ uint elements_count() { return equal_items.elements; } friend class Item_equal_fields_iterator; |