diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-10 22:27:23 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-10 22:27:23 +0000 |
| commit | af67056f28c164654686fe1f1bafddd98b2693f2 (patch) | |
| tree | e8225781eff6a4e0e7d301279b3eb95ee6d97420 /sql/sql_base.cc | |
| parent | 7f83359abc0fcdf81c600af42f67f7b9b42e21b0 (diff) | |
| parent | f4f4a2c780166cb93414839bc87fc5ff14b3e38f (diff) | |
| download | mariadb-git-af67056f28c164654686fe1f1bafddd98b2693f2.tar.gz | |
Manual merge from mysql-next-mr bug branch.
Conflicts
=========
Text conflict in sql/sql_base.cc
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e7f014d39a5..7b742364e62 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_AUTOINC_COLUMNS); - thd->set_current_stmt_binlog_format_row_if_mixed(); - } } DEBUG_SYNC(thd, "before_lock_tables_takes_lock"); |