diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-10-21 17:16:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-10-26 15:30:38 +0200 |
| commit | bf62d8e7e78c5db4de35ce4fff79247ca3459905 (patch) | |
| tree | 9e48872476c68e3d11d260e9be396b9a0a6e7c34 /sql/sql_lex.cc | |
| parent | 1f7840088f4916d48c371395e4cf1a1d8086cce9 (diff) | |
| download | mariadb-git-bf62d8e7e78c5db4de35ce4fff79247ca3459905.tar.gz | |
cleanup
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 215bd4ab085..ad526656c90 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -6402,7 +6402,7 @@ bool LEX::sf_return_fill_definition(const Lex_field_type_st &def) void LEX::set_stmt_init() { sql_command= SQLCOM_SET_OPTION; - mysql_init_select(this); + init_select(); option_type= OPT_SESSION; autocommit= 0; var_list.empty(); @@ -10384,8 +10384,7 @@ bool LEX::parsed_TVC_start() save_values_list_state(); many_values.empty(); insert_list= 0; - if (!(sel= alloc_select(TRUE)) || - push_select(sel)) + if (!(sel= alloc_select(TRUE)) || push_select(sel)) return true; sel->init_select(); sel->braces= FALSE; // just initialisation @@ -10397,9 +10396,7 @@ SELECT_LEX *LEX::parsed_TVC_end() { SELECT_LEX *res= pop_select(); // above TVC select if (!(res->tvc= - new (thd->mem_root) table_value_constr(many_values, - res, - res->options))) + new (thd->mem_root) table_value_constr(many_values, res, res->options))) return NULL; restore_values_list_state(); return res; |