diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
| commit | 62333983e4cc72ee68f2b6990b58a59aa81af0fe (patch) | |
| tree | 42184f58f95ccb6a95d95a4f24070f5ab6fc8e08 /sql/item_cmpfunc.h | |
| parent | 7c85a8d936b1a8bb82ff069f82f5ecf3ff2ab654 (diff) | |
| parent | 0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5 (diff) | |
| download | mariadb-git-62333983e4cc72ee68f2b6990b58a59aa81af0fe.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index ceca57264b7..bebe8dc1d5d 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -359,7 +359,7 @@ public: virtual void get_cache_parameters(List<Item> ¶meters); bool is_top_level_item(); bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool invisible_mode(); void reset_cache() { cache= NULL; } Item *get_copy(THD *thd, MEM_ROOT *mem_root) @@ -879,7 +879,7 @@ public: void fix_length_and_dec(); virtual void print(String *str, enum_query_type query_type); bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool count_sargable_conds(void *arg); void add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level, table_map usable_tables, @@ -1045,7 +1045,7 @@ public: } const char *func_name() const { return "if"; } bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_if>(thd, mem_root, this); } private: @@ -1691,7 +1691,7 @@ public: const char *func_name() const { return "in"; } enum precedence precedence() const { return CMP_PRECEDENCE; } bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool count_sargable_conds(void *arg); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_in>(thd, mem_root, this); } @@ -2196,7 +2196,7 @@ public: list.append(nlist); } bool fix_fields(THD *, Item **ref); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); enum Type type() const { return COND_ITEM; } List<Item>* argument_list() { return &list; } |