Skip to content

Commit

Permalink
MDEV-25362 after-merge fix: Remove unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-m committed Apr 22, 2021
1 parent ceed768 commit 0d267f7
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sql/sql_parse.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit 0d267f7

Please sign in to comment.