|
|||||||||||
|
bk commit into 5.0 tree (gkodinov:1.2492)
From: <kgeorge(at)mysql.com>
Date: Tue Jul 31 2007 - 07:42:59 EDT
ChangeSet@1.2492, 2007-07-31 14:42:56+03:00, gkodinov@magare.gmz +1 -0
addendum for the fix for bug 27417:
sql/sql_update.cc@1.222, 2007-07-31 14:42:53+03:00, gkodinov@magare.gmz +2 -1
addendum for the fix for bug 27417:
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);
}
-- MySQL Code Commits Mailing List For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.comReceived on Tue Jul 31 07:43:18 2007 This archive was generated by hypermail 2.1.8 : Thu Aug 09 2007 - 19:19:37 EDT |
||||||||||
|
|||||||||||