diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-07-31 14:42:56 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-07-31 14:42:56 +0300 |
| commit | 500af554bd93b149bcbe3795c047b2549f377794 (patch) | |
| tree | bc20ad164f29a3869e0873776077bc8d6ea36cc2 /sql/sql_update.cc | |
| parent | 9a0e6ec6d2aadd14badb65aa6e5c313ce72e276e (diff) | |
| download | mariadb-git-500af554bd93b149bcbe3795c047b2549f377794.tar.gz | |
addendum for the fix for bug 27417:
extend the assert so it will run the testsuite
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e20647dc808..c78e246f518 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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); } |