merge from 4.1

sql/sql_table.cc: merge

merge from 4.1
sql/sql_table.cc: merge
ceef6762 · unknown · c026b4f7 · 6bf0fcd1 · ceef6762
Commit ceef6762 authored Apr 11, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/sql_table.cc sql/sql_table.cc +2 -0

No files found.
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2225,7 +2225,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
      TABLE_LIST *save_next_local= table->next_local,
                 *save_next_global= table->next_global;
      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);
+      reenable_binlog(thd);
      close_thread_tables(thd);
      if (!result_code) // recreation went ok
      {