diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:58:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:58:42 +0300 |
| commit | a0588d54a20488b17a178244989e1abc5151a88a (patch) | |
| tree | 7de7ef6bd7153479ee397006dd71eab7599b43f8 /sql/sql_parse.cc | |
| parent | 031f11717d9f351dfb12cd27c225c533e289261a (diff) | |
| parent | 75c01f39b1b4a6d27d36d075f8baab9bdda7cc7e (diff) | |
| download | mariadb-git-a0588d54a20488b17a178244989e1abc5151a88a.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3ae7c7c7df3..0970857b98d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7607,6 +7607,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; if (new_select) { @@ -7614,6 +7615,7 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) DBUG_RETURN(1); select_lex->select_number= ++thd->lex->stmt_lex->current_select_number; select_lex->parent_lex= lex; /* Used in init_query. */ + curr_context= lex->context_stack.head(); select_lex->init_query(); select_lex->init_select(); } @@ -7635,7 +7637,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 { |