diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-06-18 15:16:14 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-06-18 15:16:14 +0100 |
| commit | f45b12dc5ec06757d0edfee84555fdf556f0d36f (patch) | |
| tree | 89fe2ff5fc4051f4f0ca5e9189694980ff51c96d /sql/sql_update.cc | |
| parent | 37b2b7fadbd0abc108467eb81cb8840dcd63fd3a (diff) | |
| parent | 3cf052b76cb62a3efbb29d4086a893f7f0d37d94 (diff) | |
| download | mariadb-git-f45b12dc5ec06757d0edfee84555fdf556f0d36f.tar.gz | |
auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4a0415071cb..17cc683e14a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -803,8 +803,7 @@ int mysql_update(THD *thd, if (thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query, thd->query_length, - transactional_table, FALSE, errcode) && - transactional_table) + transactional_table, FALSE, errcode)) { error=1; // Rollback update } @@ -2087,8 +2086,7 @@ bool multi_update::send_eof() errcode= query_error_code(thd, killed_status == THD::NOT_KILLED); if (thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query, thd->query_length, - transactional_tables, FALSE, errcode) && - trans_safe) + transactional_tables, FALSE, errcode)) { local_error= 1; // Rollback update } |