database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-25362 after-merge fix: Remove unnecessary code

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-22 07:36:04 +03:00
parent ceed768eea
commit 0d267f7caa
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -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)
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
{ {