diff options
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 e9330d86b8f..b596420692a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -475,8 +475,7 @@ int mysql_update(THD *thd, thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, transactional_table, FALSE); - if ((thd->query_str_binlog_unsuitable || mysql_bin_log.write(&qinfo)) - && transactional_table) + if (mysql_bin_log.write(&qinfo) && transactional_table) error=1; // Rollback update } if (!transactional_table) @@ -1442,8 +1441,7 @@ bool multi_update::send_eof() thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, transactional_tables, FALSE); - if ((thd->query_str_binlog_unsuitable || mysql_bin_log.write(&qinfo)) - && trans_safe) + if (mysql_bin_log.write(&qinfo) && trans_safe) local_error= 1; // Rollback update } if (!transactional_tables) |