Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt

into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt

Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt
24aa214a · gkodinov/kgeorge@magare.gmz · cfbfb8ba · 500af554 · 24aa214a
Commit 24aa214a 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
@@ -1551,7 +1551,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);
 }