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

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


sql/sql_update.cc:
  Auto merged

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);
 }