mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Bug#46640: output from mysqlbinlog command in 5.1 breaks replication
Added parentheses around assignment used as truth value for suppressing warnings.
This commit is contained in:
parent
3fd3aa4620
commit
2436755508
2 changed files with 2 additions and 2 deletions
|
@ -7541,7 +7541,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
|
|||
}
|
||||
|
||||
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,
|
||||
"Error in %s event: commit of row events failed, "
|
||||
"table `%s`.`%s`",
|
||||
|
|
|
@ -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
|
||||
binlog.
|
||||
*/
|
||||
if (error= ha_autocommit_or_rollback(thd, 0))
|
||||
if ((error= ha_autocommit_or_rollback(thd, 0)))
|
||||
rli->report(ERROR_LEVEL, error,
|
||||
"Error in %s event: commit of row events failed, "
|
||||
"table `%s`.`%s`",
|
||||
|
|
Loading…
Reference in a new issue