addendum for the fix for bug 27417:

extend the assert so it will run the testsuite

addendum for the fix for bug 27417:
extend the assert so it will run the testsuite
500af554 · gkodinov/kgeorge@magare.gmz · 9a0e6ec6 · 500af554
Commit 500af554 authored Jul 31, 2007 by gkodinov/kgeorge@magare.gmz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_update.cc sql/sql_update.cc +2 -1

No files found.
--- 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);
 }