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_subselect.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_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 009aff5ed80..424ea6f0512 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -169,7 +169,7 @@ public: } bool fix_fields(THD *thd, Item **ref); bool mark_as_dependent(THD *thd, st_select_lex *select, Item *item); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void recalc_used_tables(st_select_lex *new_parent, bool after_pullout); virtual bool exec(); /* @@ -607,7 +607,7 @@ public: virtual void print(String *str, enum_query_type query_type); bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); - 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 const_item() const { return Item_subselect::const_item() && left_expr->const_item(); |