diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
| commit | c94a46240a912bd71d6ec961132ae3e6f4746bd5 (patch) | |
| tree | 667c2782c7fcee247010d3413aaf80a81fc6dd92 /sql/sql_update.cc | |
| parent | 06756c19c5a27a5240dc1dd7c243c32db04ccf00 (diff) | |
| parent | dc00a524640646d8fadc8a906ed91343fdd43fc6 (diff) | |
| download | mariadb-git-c94a46240a912bd71d6ec961132ae3e6f4746bd5.tar.gz | |
Merge chunk from trunk.
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 ab277f63049..e4965748e24 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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 |