mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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.
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user