diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 11:42:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 11:42:44 +0200 |
| commit | 44d70c01f0aef419bc1325f0cba6a46085042646 (patch) | |
| tree | d12df15e2f47fbc884591bfec0e14fcb613fd7d3 /sql/sql_parse.cc | |
| parent | 126725421e56293d7c8b816e066271606b59dcd5 (diff) | |
| parent | 867724fd304caf714d3cd2aa825f2c8b3b724017 (diff) | |
| download | mariadb-git-44d70c01f0aef419bc1325f0cba6a46085042646.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index dad7b804e7e..23214020486 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8987,7 +8987,13 @@ push_new_name_resolution_context(THD *thd, left_op->first_leaf_for_name_resolution(); on_context->last_name_resolution_table= right_op->last_leaf_for_name_resolution(); - return thd->lex->push_context(on_context); + LEX *lex= thd->lex; + on_context->select_lex = lex->current_select; + st_select_lex *curr_select= lex->pop_select(); + st_select_lex *outer_sel= lex->select_stack_head(); + lex->push_select(curr_select); + on_context->outer_context = outer_sel ? &outer_sel->context : 0; + return lex->push_context(on_context); } |