diff options
| author | unknown <aelkin@dl145j.mysql.com> | 2007-09-15 21:25:56 +0200 |
|---|---|---|
| committer | unknown <aelkin@dl145j.mysql.com> | 2007-09-15 21:25:56 +0200 |
| commit | e35c1ab9a287264ec167f6c17c690aabbf921715 (patch) | |
| tree | fc09beb28356b1412aac29629c639e209c908fe6 /sql/sql_delete.cc | |
| parent | 48f38afb8ee84ea6a08710374a54098581683444 (diff) | |
| parent | 69604f4db10f125651ab0620320dbd91253c5bc6 (diff) | |
| download | mariadb-git-e35c1ab9a287264ec167f6c17c690aabbf921715.tar.gz | |
Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl
into dl145j.mysql.com:/tmp/andrei/5.1-merge
BitKeeper/deleted/.del-sp_trans_log.result:
Auto merged
BitKeeper/deleted/.del-sp_trans_log.test:
Auto merged
mysql-test/suite/rpl/r/rpl_packet.result:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
should be re-recorded
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
manual merge
mysql-test/suite/rpl/t/rpl_packet.test:
manual merge
sql/slave.cc:
manual merge
sql/sql_insert.cc:
manual merge - installing 5.0 patch logics
sql/sql_load.cc:
manual merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 303918f42a2..d5e88ab8761 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -345,7 +345,7 @@ cleanup: thd->transaction.stmt.modified_non_trans_table= TRUE; /* See similar binlogging code in sql_update.cc, for comments */ - if ((error < 0) || (deleted && !transactional_table)) + if ((error < 0) || thd->transaction.stmt.modified_non_trans_table) { if (mysql_bin_log.is_open()) { @@ -862,7 +862,8 @@ bool multi_delete::send_eof() { query_cache_invalidate3(thd, delete_tables, 1); } - if ((local_error == 0) || (deleted && normal_tables)) + DBUG_ASSERT(!normal_tables || !deleted || thd->transaction.stmt.modified_non_trans_table); + if ((local_error == 0) || thd->transaction.stmt.modified_non_trans_table) { if (mysql_bin_log.is_open()) { @@ -879,7 +880,6 @@ bool multi_delete::send_eof() if (thd->transaction.stmt.modified_non_trans_table) thd->transaction.all.modified_non_trans_table= TRUE; } - DBUG_ASSERT(!normal_tables || !deleted || thd->transaction.stmt.modified_non_trans_table); /* Commit or rollback the current SQL statement */ if (transactional_tables) |