diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:06:31 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:06:31 +0300 |
commit | ceed768eead2c858b0ace76e1ed35fd75f74dc00 (patch) | |
tree | 42daade4f3dd946b91cccec1fd6ac6315fc58576 | |
parent | a0588d54a20488b17a178244989e1abc5151a88a (diff) | |
download | mariadb-git-ceed768eead2c858b0ace76e1ed35fd75f74dc00.tar.gz |
MDEV-25362 after-merge fix: GCC -Og -Wmaybe-uninitialized
-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 0970857b98d..8d335f5fa86 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7606,8 +7606,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) { @@ -7615,7 +7615,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(); } |