diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-09 14:05:53 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-09 14:05:53 +0400 |
| commit | 0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5 (patch) | |
| tree | 542689300b4ebd90eed162a54870fc1a57261eca /sql/item_cmpfunc.h | |
| parent | 644ffdeb9290a5fc861ecd286a5af4388b4339ad (diff) | |
| parent | c2c93fc6e460fd32b6ef179686c2b3b2045f75eb (diff) | |
| download | mariadb-git-0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
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 a34e70f9918..cc336289355 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -342,7 +342,7 @@ public: virtual void get_cache_parameters(List<Item> ¶meters); bool is_top_level_item(); bool eval_not_null_tables(uchar *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; } }; @@ -824,7 +824,7 @@ public: void fix_length_and_dec(); virtual void print(String *str, enum_query_type query_type); bool eval_not_null_tables(uchar *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(uchar *arg); void add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level, table_map usable_tables, @@ -980,7 +980,7 @@ public: } const char *func_name() const { return "if"; } bool eval_not_null_tables(uchar *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); private: void cache_type_info(Item *source); }; @@ -1595,7 +1595,7 @@ public: enum Functype functype() const { return IN_FUNC; } const char *func_name() const { return " IN "; } bool eval_not_null_tables(uchar *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(uchar *arg); }; @@ -2063,7 +2063,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; } |