diff options
| author | monty@mashka.mysql.fi <> | 2002-12-01 00:48:35 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-01 00:48:35 +0200 |
| commit | d02d23c4c0e5dcd3c47925ef77f5e398afe2c0c7 (patch) | |
| tree | a726bf37c8fdf17db95a039fbba27a43d981696f /sql/sql_update.cc | |
| parent | bd53a30858626d6efd58f3016ed3d716fc0efd0f (diff) | |
| download | mariadb-git-d02d23c4c0e5dcd3c47925ef77f5e398afe2c0c7.tar.gz | |
Fixed some bugs from last multi-table-update push.
More tests for multi-table-update & timestamp handling
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 12d0ee8d7a2..887d4e0acc0 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -832,7 +832,7 @@ bool multi_update::send_eof() Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); if (mysql_bin_log.write(&qinfo) && trans_safe) - local_error=1; // Rollback update + local_error= 1; // Rollback update } if (!log_delayed) thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; @@ -840,7 +840,7 @@ bool multi_update::send_eof() if (transactional_tables) { - if (ha_autocommit_or_rollback(thd, local_error >= 0)) + if (ha_autocommit_or_rollback(thd, local_error != 0)) local_error=1; } |