Skip to content

M
MariaDB
Commit 0d267f7c authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

MDEV-25362 after-merge fix: Remove unnecessary code

parent ceed768e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
sql/sql_parse.cc
View file @ 0d267f7c
...@@ -7606,7 +7606,6 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) ...@@ -7606,7 +7606,6 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex)
THD *thd= lex->thd; THD *thd= lex->thd;
bool new_select= select_lex == NULL; bool new_select= select_lex == NULL;
int old_nest_level= lex->current_select->nest_level; int old_nest_level= lex->current_select->nest_level;
Name_resolution_context *curr_context= lex->context_stack.head();
DBUG_ENTER("mysql_new_select"); DBUG_ENTER("mysql_new_select");
if (new_select) if (new_select)
...@@ -7636,8 +7635,7 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) ...@@ -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 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 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 else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7