From fe6fa48c18c8acf03b89525e2e8b4ca6f324e1ff Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jul 2007 14:42:56 +0300 Subject: addendum for the fix for bug 27417: extend the assert so it will run the testsuite --- sql/sql_update.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e20647dc808..c78e246f518 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1333,7 +1333,8 @@ multi_update::~multi_update() if (copy_field) delete [] copy_field; thd->count_cuted_fields= CHECK_FIELD_IGNORE; // Restore this setting - DBUG_ASSERT(trans_safe || thd->transaction.all.modified_non_trans_table); + DBUG_ASSERT(trans_safe || !updated || + thd->transaction.all.modified_non_trans_table); } -- cgit v1.2.1