Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"

if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table() is not supposed to do any binlogging (it is done by the caller).

Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table() is not supposed to do any binlogging (it is done by the caller).
c7c928f1 · gbichot@quadita2.mysql.com · 831a6124 · c7c928f1
Commit c7c928f1 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 @@ send_result_message:
      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
      {