diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2009-10-23 11:13:42 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2009-10-23 11:13:42 +0800 |
| commit | 2436755508f081912134d375aea5f39a2b64325f (patch) | |
| tree | f195a7ea7444d38b3ec40036bf0eb5e9b45f745e | |
| parent | 3fd3aa46205282bda0102a123408e5edc354c75e (diff) | |
| download | mariadb-git-2436755508f081912134d375aea5f39a2b64325f.tar.gz | |
Bug#46640: output from mysqlbinlog command in 5.1 breaks replication
Added parentheses around assignment used as truth value for suppressing warnings.
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/log_event_old.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 76532836b73..2cb253c9c56 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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`", diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 3389821a718..357bc78b1cd 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -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`", |