diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
| commit | 28f01f82e1cb682566017b52017469be7638dd49 (patch) | |
| tree | d496cb0936d25973b95f6eb591508c2e493032b8 /sql/sql_parse.cc | |
| parent | a3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff) | |
| parent | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff) | |
| download | mariadb-git-bb-10.6-merge.tar.gz | |
WIP merge 10.5 to 10.6bb-10.6-merge
FIXME: Disabled tests due to upgrading libmariadb:
main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ddfc49c6d52..0d8ff8fee36 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7641,6 +7641,7 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) bool new_select= select_lex == NULL; int old_nest_level= lex->current_select->nest_level; DBUG_ENTER("mysql_new_select"); + Name_resolution_context *curr_context= lex->context_stack.head(); if (new_select) { @@ -7669,7 +7670,8 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) By default we assume that it is usual subselect and we have outer name resolution context, if no we will assign it to 0 later */ - select_lex->context.outer_context= &select_lex->outer_select()->context; + + select_lex->context.outer_context= curr_context; } else { |