Skip to content

M
MariaDB
Commit b136da2c authored by unknown's avatar unknown
Browse files
Options

merge from 4.1 


sql/sql_table.cc:
  merge
parents 2382422e 12e352b5
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sql/sql_table.cc
View file @ b136da2c
...@@ -2225,7 +2225,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -2225,7 +2225,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
TABLE_LIST *save_next_local= table->next_local, TABLE_LIST *save_next_local= table->next_local,
*save_next_global= table->next_global; *save_next_global= table->next_global;
table->next_local= table->next_global= 0; table->next_local= table->next_global= 0;
tmp_disable_binlog(thd); // binlogging is done by caller if wanted
result_code= mysql_recreate_table(thd, table, 0); result_code= mysql_recreate_table(thd, table, 0);
reenable_binlog(thd);
close_thread_tables(thd); close_thread_tables(thd);
if (!result_code) // recreation went ok if (!result_code) // recreation went ok
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7