Commit 24367555 authored by unknown's avatar unknown

Bug#46640: output from mysqlbinlog command in 5.1 breaks replication

Added parentheses around assignment used as truth value for suppressing warnings.
parent 3fd3aa46
...@@ -7541,7 +7541,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli) ...@@ -7541,7 +7541,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
} }
if (get_flags(STMT_END_F)) if (get_flags(STMT_END_F))
if (error= rows_event_stmt_cleanup(rli, thd)) if ((error= rows_event_stmt_cleanup(rli, thd)))
rli->report(ERROR_LEVEL, error, rli->report(ERROR_LEVEL, error,
"Error in %s event: commit of row events failed, " "Error in %s event: commit of row events failed, "
"table `%s`.`%s`", "table `%s`.`%s`",
......
...@@ -1842,7 +1842,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli) ...@@ -1842,7 +1842,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
are involved, commit the transaction and flush the pending event to the are involved, commit the transaction and flush the pending event to the
binlog. binlog.
*/ */
if (error= ha_autocommit_or_rollback(thd, 0)) if ((error= ha_autocommit_or_rollback(thd, 0)))
rli->report(ERROR_LEVEL, error, rli->report(ERROR_LEVEL, error,
"Error in %s event: commit of row events failed, " "Error in %s event: commit of row events failed, "
"table `%s`.`%s`", "table `%s`.`%s`",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment