database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Code Activity

Merge branch '11.4' into 11.8

Browse Source
This commit is contained in:
Sergei Golubchik
2025-07-28 20:16:25 +02:00
parent 982535b11f c4ed889b74
commit b565b3e7e0
380 changed files with 11138 additions and 2776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_admin.cc
View File

@@ -73,9 +73,8 @@ static bool admin_recreate_table(THD *thd, TABLE_LIST *table_list,
/* Ignore if there is more than one table in the list */
save_next_global= table_list->next_global;
table_list->next_global= 0;
result_code= (thd->open_temporary_tables(table_list) ||
mysql_recreate_table(thd, table_list, recreate_info,
table_copy));
result_code= thd->check_and_open_tmp_table(table_list) ||
mysql_recreate_table(thd, table_list, recreate_info, table_copy);
table_list->next_global= save_next_global;
reenable_binlog(thd);
/*
@@ -577,6 +576,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
Disable_wsrep_on_guard wsrep_on_guard(thd, disable_wsrep_on);
#endif /* WITH_WSREP */
if (thd->transaction->xid_state.check_has_uncommitted_xa())
DBUG_RETURN(TRUE);
fill_check_table_metadata_fields(thd, &field_list);
if (protocol->send_result_set_metadata(&field_list,