bk commit into 5.0 tree (gkodinov:1.2492)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-31 14:42:56+03:00, gkodinov@stripped +1 -0
  addendum for the fix for bug 27417:
  extend the assert so it will run the testsuite

  sql/sql_update.cc@stripped, 2007-07-31 14:42:53+03:00, gkodinov@stripped +2 -1
    addendum for the fix for bug 27417:
    extend the assert so it will run the testsuite

diff -Nrup a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc	2007-07-30 18:27:30 +03:00
+++ b/sql/sql_update.cc	2007-07-31 14:42:53 +03:00
@@ -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);
 }