diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:07:08 +0100 |
| commit | c7c415734d27fb98f8019d4c3b646bbdb4906e46 (patch) | |
| tree | 1b71b075e54aac0e7b3b5a240f5835b0cc1d61d4 /sql/sql_parse.cc | |
| parent | 10635c2833a951b11b1d56e388244127e257ffb5 (diff) | |
| parent | 76bcea3154a3ac2c26024ac5cb241e19e0e277d9 (diff) | |
| download | mariadb-git-c7c415734d27fb98f8019d4c3b646bbdb4906e46.tar.gz | |
Merge branch '10.10' into 10.11
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 48c3147a95c..2460b3f2a7a 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; } @@ -8808,8 +8810,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; @@ -8836,8 +8838,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 + @@ -8863,8 +8865,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 + |