1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä 2021-04-21 10:27:13 +03:00
commit d104fe6f73
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -7709,8 +7709,8 @@ 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");
Name_resolution_context *curr_context;
if (new_select) if (new_select)
{ {
@ -7718,7 +7718,6 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex)
DBUG_RETURN(1); DBUG_RETURN(1);
select_lex->select_number= ++thd->lex->stmt_lex->current_select_number; select_lex->select_number= ++thd->lex->stmt_lex->current_select_number;
select_lex->parent_lex= lex; /* Used in init_query. */ select_lex->parent_lex= lex; /* Used in init_query. */
curr_context= lex->context_stack.head();
select_lex->init_query(); select_lex->init_query();
select_lex->init_select(); select_lex->init_select();
} }