diff options
| author | unknown <karen.langford@oracle.com> | 2010-08-19 17:18:58 +0200 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2010-08-19 17:18:58 +0200 |
| commit | 69c280506808e434e20669d838724d43b675540c (patch) | |
| tree | 58dcaca8f6bb6636e918f66e89953496de5def27 /sql/sql_insert.cc | |
| parent | 3ac03a0b1b3af3b1139dfc94372d9d441fcaebc7 (diff) | |
| parent | 7909541953de43c7b7d16513c8d612cfe405af67 (diff) | |
| download | mariadb-git-69c280506808e434e20669d838724d43b675540c.tar.gz | |
Merge from mysql-5.1.50-release
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 35c24e7571e..83b1834da0b 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3873,6 +3873,17 @@ void select_create::abort() if (table) { + if (thd->lex->sql_command == SQLCOM_CREATE_TABLE && + thd->current_stmt_binlog_row_based && + !(thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) && + mysql_bin_log.is_open()) + { + /* + This should be removed after BUG#47899. + */ + mysql_bin_log.reset_gathered_updates(thd); + } + table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); if (!create_info->table_existed) |