diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-11-08 15:47:49 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-11-09 09:31:03 +0100 |
| commit | c2c93fc6e460fd32b6ef179686c2b3b2045f75eb (patch) | |
| tree | e43f37d35eb5633e81cd8e9d42d55626c13ec2ed /sql/item_subselect.h | |
| parent | ca695888e00a4bdace1bc2143d91a0a871f39a6b (diff) | |
| download | mariadb-git-c2c93fc6e460fd32b6ef179686c2b3b2045f75eb.tar.gz | |
MDEV-14164: Unknown column error when adding aggregate to function in oracle style procedure FOR loop
Make differentiation between pullout for merge and pulout of outer field during exists2in transformation.
In last case the field was outer and so we can safely start from name resolution context of the SELECT where it was pulled.
Old behavior lead to inconsistence between list of tables and outer name resolution context (which skips one SELECT for merge purposes) which creates problem vor name resolution.
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 ad43215e437..769be7ee925 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -172,7 +172,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(); /* @@ -608,7 +608,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(); |