From: Bjorn Munch Date: November 19 2010 10:41am Subject: bzr push into mysql-trunk-bugfixing branch (bjorn.munch:3362 to 3363) List-Archive: http://lists.mysql.com/commits/124412 Message-Id: <201011191041.oAJAfnU4017324@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3363 Bjorn Munch 2010-11-19 merge mistake modified: mysql-test/suite/rpl/t/rpl_packet.test 3362 Bjorn Munch 2010-11-19 [merge] null upmerge === modified file 'mysql-test/suite/rpl/t/rpl_packet.test' --- a/mysql-test/suite/rpl/t/rpl_packet.test 2010-11-19 10:36:56 +0000 +++ b/mysql-test/suite/rpl/t/rpl_packet.test 2010-11-19 10:41:26 +0000 @@ -207,7 +207,7 @@ while($i) { --let $flags=--start-position=$start_pos - if(`SELECT $i=2`) + if($i==2) { --let $flags= $flags --base64-output=decode-rows -v } No bundle (reason: useless for push emails).