diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-20 12:09:17 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-20 12:09:17 +0300 |
| commit | 7d3a9b4cf68475f24b24f64ae43a205d6016b83e (patch) | |
| tree | d7d20b0fb3455280191417a9653848ff8d25442e /sql/sql_insert.cc | |
| parent | dd9329761ae48e3d8518f882d1ca12737a4165d0 (diff) | |
| parent | 69c280506808e434e20669d838724d43b675540c (diff) | |
| download | mariadb-git-7d3a9b4cf68475f24b24f64ae43a205d6016b83e.tar.gz | |
merge
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 8604f876f37..567c7ff2b30 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3972,6 +3972,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) |