diff options
| author | mkindahl@dl145h.mysql.com <> | 2008-02-15 17:49:05 +0100 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2008-02-15 17:49:05 +0100 |
| commit | c5273c175915e9597d389e77d7061e6877cbd2ad (patch) | |
| tree | 4a0183d0989d27a9ad1226df52f45cf0c8a9532c /sql/sql_delete.cc | |
| parent | ec9c79138f530c9661209d5739d627db1abd3cc4 (diff) | |
| parent | 416001d8edf8c1864f35a3981f4bb05fce0f25aa (diff) | |
| download | mariadb-git-c5273c175915e9597d389e77d7061e6877cbd2ad.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c6435387f44..28450af6c56 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -780,8 +780,6 @@ void multi_delete::abort() } thd->transaction.all.modified_non_trans_table= true; } - DBUG_ASSERT(!normal_tables || !deleted || - thd->transaction.stmt.modified_non_trans_table); DBUG_VOID_RETURN; } @@ -899,8 +897,6 @@ bool multi_delete::send_eof() { query_cache_invalidate3(thd, delete_tables, 1); } - 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()) |