Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
e42312c0 · gbichot@quadita2.mysql.com · d07945c2 · c7c928f1 · e42312c0
Commit e42312c0 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
@@ -2041,7 +2041,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
      close_thread_tables(thd);
      TABLE_LIST *save_next= table->next;
      table->next= 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
      {