diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
| commit | b45ed284a69cdbffac61bdcf74bf86fa7b7391a4 (patch) | |
| tree | de26ce8e0a5aa40889e889d758e3a3a98b9f71a8 /sql/sql_parse.cc | |
| parent | cc182aca9352fb7efde0deb0a83844e1d5f0c64c (diff) | |
| parent | cafba8761af55ae16cc69c9b53a341340a845b36 (diff) | |
| download | mariadb-git-bb-11.0-all-builders.tar.gz | |
Merge branch '10.11' into 11.0bb-11.0-all-builders
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 579e4cd27f7..ee894fe55de 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4210,8 +4210,10 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) WSREP_TO_ISOLATION_BEGIN(first_table->db.str, first_table->table_name.str, NULL); + Recreate_info recreate_info; res= mysql_alter_table(thd, &first_table->db, &first_table->table_name, - &create_info, first_table, &alter_info, + &create_info, first_table, + &recreate_info, &alter_info, 0, (ORDER*) 0, 0, lex->if_exists()); break; } @@ -8806,8 +8808,8 @@ TABLE_LIST *st_select_lex::convert_right_join() void st_select_lex::prepare_add_window_spec(THD *thd) { LEX *lex= thd->lex; - lex->save_group_list= group_list; - lex->save_order_list= order_list; + save_group_list= group_list; + save_order_list= order_list; lex->win_ref= NULL; lex->win_frame= NULL; lex->frame_top_bound= NULL; @@ -8834,8 +8836,8 @@ bool st_select_lex::add_window_def(THD *thd, win_part_list_ptr, win_order_list_ptr, win_frame); - group_list= thd->lex->save_group_list; - order_list= thd->lex->save_order_list; + group_list= save_group_list; + order_list= save_order_list; if (parsing_place != SELECT_LIST) { fields_in_window_functions+= win_part_list_ptr->elements + @@ -8861,8 +8863,8 @@ bool st_select_lex::add_window_spec(THD *thd, win_part_list_ptr, win_order_list_ptr, win_frame); - group_list= thd->lex->save_group_list; - order_list= thd->lex->save_order_list; + group_list= save_group_list; + order_list= save_order_list; if (parsing_place != SELECT_LIST) { fields_in_window_functions+= win_part_list_ptr->elements + |