diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:01:48 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 11:01:48 +0100 |
| commit | 76bcea3154a3ac2c26024ac5cb241e19e0e277d9 (patch) | |
| tree | cbe9339633c5eb6b9206c89a3b1c65495f05e868 /sql/sql_parse.cc | |
| parent | 51fc6b91d2d3c40a69b78f2e47641107d65a957b (diff) | |
| parent | de2d08994255739d53ba28ea34288ca8352029b1 (diff) | |
| download | mariadb-git-76bcea3154a3ac2c26024ac5cb241e19e0e277d9.tar.gz | |
Merge branch '10.9' into 10.10
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 91e2be2c78e..b69553e2c9e 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; } @@ -8832,8 +8834,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; @@ -8860,8 +8862,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 + @@ -8887,8 +8889,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 + |