diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:27:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:27:13 +0300 |
| commit | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (patch) | |
| tree | 38975c5d478082b4f9299846a6b30542eaa35bfa | |
| parent | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff) | |
| parent | ceed768eead2c858b0ace76e1ed35fd75f74dc00 (diff) | |
| download | mariadb-git-d104fe6f734df2aebe24b3e5e3dbc189a5302920.tar.gz | |
Merge 10.4 into 10.5st-10.5
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 344be7bf273..2376463d0f8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7709,8 +7709,8 @@ 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"); - Name_resolution_context *curr_context; if (new_select) { @@ -7718,7 +7718,6 @@ mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *select_lex) DBUG_RETURN(1); select_lex->select_number= ++thd->lex->stmt_lex->current_select_number; select_lex->parent_lex= lex; /* Used in init_query. */ - curr_context= lex->context_stack.head(); select_lex->init_query(); select_lex->init_select(); } |