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_subselect.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_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 7f827bbe982..7e99e2c3075 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -183,7 +183,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(); /* @@ -627,7 +627,7 @@ public: enum precedence precedence() const { return CMP_PRECEDENCE; } 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(); |