bzr commit into mysql-pe branch (Dao-Gang.Qu:3684) Bug#46640

[Dao-Gang.Qu]

#At file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-pe/ based on revid:luis.soares@stripped

 3684 Dao-Gang.Qu@stripped	2009-10-23 [merge]
      Bug#46640: output from mysqlbinlog command in 5.1 breaks replication
      
      Added parentheses around assignment used as truth value for suppressing warnings.

    modified:
      sql/log_event.cc
      sql/log_event_old.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-10-16 13:12:38 +0000
+++ b/sql/log_event.cc	2009-10-23 03:27:21 +0000
@@ -7591,7 +7591,7 @@ int Rows_log_event::do_apply_event(Relay
   }
 
   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`",

=== modified file 'sql/log_event_old.cc'
--- a/sql/log_event_old.cc	2009-10-14 02:00:48 +0000
+++ b/sql/log_event_old.cc	2009-10-23 03:27:21 +0000
@@ -1806,7 +1806,7 @@ int Old_rows_log_event::do_apply_event(R
       are involved, commit the transaction and flush the pending event to the
       binlog.
     */
-    if (error= trans_commit_stmt(thd))
+    if ((error= trans_commit_stmt(thd)))
       rli->report(ERROR_LEVEL, error,
                   "Error in %s event: commit of row events failed, "
                   "table `%s`.`%s`",


Attachment: [text/bzr-bundle] bzr/[e-mail]