merge from 4.1

This commit is contained in:
gbichot@quadita2.mysql.com 2005-04-11 16:59:06 +02:00
commit e0831dce7a

View file

@ -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
{