merge from 4.1

e0831dce · gbichot@quadita2.mysql.com · 4bb4a285 · e42312c0 · e0831dce
Commit e0831dce authored Apr 11, 2005 by gbichot@quadita2.mysql.com
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 @@ send_result_message:
      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
      {