Commit ceef6762 authored by unknown's avatar unknown
Browse files

merge from 4.1 


sql/sql_table.cc:
  merge
parents c026b4f7 6bf0fcd1

sql/sql_table.cc

+2 −0
Original line number Diff line number Diff line
@@ -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

      {