diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-15 17:49:05 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-15 17:49:05 +0100 |
| commit | 44a2e316bd08a6c532777823670cdd7935fd8577 (patch) | |
| tree | 4a0183d0989d27a9ad1226df52f45cf0c8a9532c /sql/sql_update.cc | |
| parent | 8d97e31649a61595dec8a4dc7f3f74d33d117906 (diff) | |
| parent | 44d0c38cf7bada0adfb1db651cdbf4081aabbb2b (diff) | |
| download | mariadb-git-44a2e316bd08a6c532777823670cdd7935fd8577.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
BitKeeper/deleted/.del-rpl_variables.test:
Manual merge.
mysql-test/r/multi_update.result:
Manual merge.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Manual merge.
sql/slave.cc:
Manual merge.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4d075e3308d..22631ee3342 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1203,7 +1203,7 @@ multi_update::multi_update(TABLE_LIST *table_list, tmp_tables(0), updated(0), found(0), fields(field_list), values(value_list), table_count(0), copy_field(0), handle_duplicates(handle_duplicates_arg), do_update(1), trans_safe(1), - transactional_tables(1), ignore(ignore_arg), error_handled(0) + transactional_tables(0), ignore(ignore_arg), error_handled(0) {} @@ -1718,7 +1718,7 @@ void multi_update::abort() if (trans_safe) { - DBUG_ASSERT(transactional_tables); + DBUG_ASSERT(!updated || transactional_tables); (void) ha_autocommit_or_rollback(thd, 1); } else |