diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
| commit | bea4ab9bb65f6ff576b9b71011c5a8f22baa164a (patch) | |
| tree | 5d91d6cc01f82639588f2c17fbb5289637567684 /sql/sql_delete.cc | |
| parent | c082955f0676efe069f30384102ba7807b49dee6 (diff) | |
| parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
| download | mariadb-git-bea4ab9bb65f6ff576b9b71011c5a8f22baa164a.tar.gz | |
Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 17f1036d70e..d0988ea46f8 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -849,9 +849,10 @@ void multi_delete::abort() if (mysql_bin_log.is_open()) { int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED); - thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query(), thd->query_length(), - transactional_tables, FALSE, errcode); + /* possible error of writing binary log is ignored deliberately */ + (void) thd->binlog_query(THD::ROW_QUERY_TYPE, + thd->query(), thd->query_length(), + transactional_tables, FALSE, errcode); } thd->transaction.all.modified_non_trans_table= true; } @@ -1181,8 +1182,9 @@ end: TRUNCATE must always be statement-based binlogged (not row-based) so we don't test current_stmt_binlog_row_based. */ - write_bin_log(thd, TRUE, thd->query(), thd->query_length()); - my_ok(thd); // This should return record count + error= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); + if (!error) + my_ok(thd); // This should return record count } mysql_mutex_lock(&LOCK_open); unlock_table_name(thd, table_list); |