diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
| commit | de2d08994255739d53ba28ea34288ca8352029b1 (patch) | |
| tree | cc557fe9fa3655a03cae9b6895c6e8a0348b2f86 /sql/sql_parse.cc | |
| parent | 4d9fe4032b768e04e33482d83199882c7bb0d9d8 (diff) | |
| parent | 638625278e7cadf42633e6f9d1b663ca1e3e1bb1 (diff) | |
| download | mariadb-git-de2d08994255739d53ba28ea34288ca8352029b1.tar.gz | |
Merge branch '10.8' into 10.9
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 c51d7b693d9..58a02465223 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4209,8 +4209,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; } @@ -8834,8 +8836,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; @@ -8862,8 +8864,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 + @@ -8889,8 +8891,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 + |