From f4f4a2c780166cb93414839bc87fc5ff14b3e38f Mon Sep 17 00:00:00 2001 From: Luis Soares Date: Wed, 10 Feb 2010 21:57:07 +0000 Subject: [PATCH] BUG#51021: current_stmt_binlog_row_based not removed in next-mr A closely related problem, hardly worth a new bug report: Removed a spurious call to: thd->set_current_stmt_binlog_format_row_if_mixed() in sql_base.cc:lock_tables(). --- sql/sql_base.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index eb59600b360..ff330d1b5bb 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5180,10 +5180,7 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count, bool *need_reopen) */ if (thd->variables.binlog_format != BINLOG_FORMAT_ROW && tables && has_write_table_with_auto_increment(thd->lex->first_not_own_table())) - { thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_TWO_AUTOINC_COLUMNS); - thd->set_current_stmt_binlog_format_row_if_mixed(); - } } DEBUG_SYNC(thd, "before_lock_tables_takes_lock");