1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


sql/sql_update.cc:
  Auto merged
This commit is contained in:
unknown 2007-07-31 14:48:57 +03:00
commit 86d9a7f92a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@ -1551,7 +1551,8 @@ multi_update::~multi_update()
if (copy_field) if (copy_field)
delete [] copy_field; delete [] copy_field;
thd->count_cuted_fields= CHECK_FIELD_IGNORE; // Restore this setting 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);
} }