mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 19:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge chunk from trunk.

Browse source
This commit is contained in:
Chad MILLER 2008-07-10 14:50:07 -04:00
commit c425bf421d
419 changed files with 64678 additions and 54649 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_update.cc
View file

@ -979,7 +979,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)
{}
@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errcode,const char *err)
if (trans_safe)
{
DBUG_ASSERT(transactional_tables);
DBUG_ASSERT(!updated || transactional_tables);
(void) ha_autocommit_or_rollback(thd, 1);
}
else