diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 07:36:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 07:36:04 +0300 |
| commit | 0d267f7caa1421f9e2b22412694546e499845488 (patch) | |
| tree | 651c5419ca8cb9bd927b2e735695f1f4a43ff79f | |
| parent | ceed768eead2c858b0ace76e1ed35fd75f74dc00 (diff) | |
| download | mariadb-git-0d267f7caa1421f9e2b22412694546e499845488.tar.gz | |
MDEV-25362 after-merge fix: Remove unnecessary code
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8d335f5fa86..3ae7c7c7df3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7606,7 +7606,6 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) THD *thd= lex->thd; bool new_select= select_lex == NULL; int old_nest_level= lex->current_select->nest_level; - Name_resolution_context *curr_context= lex->context_stack.head(); DBUG_ENTER("mysql_new_select"); if (new_select) @@ -7636,8 +7635,7 @@ 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= curr_context; + select_lex->context.outer_context= &select_lex->outer_select()->context; } else { |