From: Andrei Elkin
Date: March 8 2011 11:29am
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3733) Bug#58753
List-Archive: http://lists.mysql.com/commits/132584
X-Bug: 58753
Message-Id: <201103081129.p28BTGcT031153@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0771595749=="

--===============0771595749==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ based on revid:jon.hauglid@stripped

 3733 Andrei Elkin	2011-03-08
      Merging Bug #58753 fixes to mysql-trunk removed a suppression in rpl_checksum.
      This patch restores it.
     @ mysql-test/suite/rpl/r/rpl_checksum.result
        results are updated.
     @ mysql-test/suite/rpl/t/rpl_checksum.test
        restoring earlier patch's suppression.

    modified:
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/t/rpl_checksum.test
=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result	2011-02-21 13:23:29 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2011-03-08 11:29:11 +0000
@@ -4,6 +4,7 @@ call mtr.add_suppression('Slave can not 
 call mtr.add_suppression('Replication event checksum verification failed');
 call mtr.add_suppression('Relay log write failure: could not queue event from master');
 call mtr.add_suppression('Event crc check failed! Most likely there is event corruption');
+call mtr.add_suppression('Master is configured to log replication events with checksum, but will not send such events to slaves that cannot process');
 set @master_save_binlog_checksum= @@global.binlog_checksum;
 set @save_master_verify_checksum =  @@global.master_verify_checksum;
 select @@global.binlog_checksum as 'must be CRC32 because of the command line option';

=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test	2011-02-21 13:23:29 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2011-03-08 11:29:11 +0000
@@ -10,6 +10,7 @@ call mtr.add_suppression('Replication ev
 # due to C failure simulation
 call mtr.add_suppression('Relay log write failure: could not queue event from master');
 call mtr.add_suppression('Event crc check failed! Most likely there is event corruption');
+call mtr.add_suppression('Master is configured to log replication events with checksum, but will not send such events to slaves that cannot process');
 
 # A. read/write access to the global vars:
 # binlog_checksum master_verify_checksum slave_sql_verify_checksum


--===============0771595749==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# testament_sha1: d76f34d34d6bbe047de3f8aff2ac3651aa3ace56
# timestamp: 2011-03-08 13:29:16 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-\
#   bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   y11zrt2dqau21azn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfaf0McAAknfgEAQWOf//3IC
BAC////wUAWM90ObRzcl23LW2mnSEkkaGgSej0Tamgk8o8ppoNBoHoJSnoU/SDCNIp+momm9UNAA
ADQSJBATUnqep6jT9U9QH6oDYo/VHoQ9QYDQAADQAAAAABJII0ZNIJmpp6TTTJkT1T1PUPUzSaHW
/HSTDekjPIpCU+GWN6VAyJlm7OsZ0vKmJ2IDM03ryR4Tr5IMNrm5Exmy3C7j4ewxPuSKwWGZlr1v
p4l2Z0HvIJwTjYXbDZVXULi81vqDJDWVSD0YmqA7Rr3kvnsD2Ec5nU1aiHPqfc4AaBOQoLcyZ87C
amNDTcFRsbSxvkZCI3agQTcvEMx0mJXGF7XqHDQed6RizCgCIicksTcLSKj9yQx3K9Fpcxax7ARh
MCAFM7RdoFGSKlP7yrqAuQqgVKy437FAiWioBV1eGDsSVpJeQWfx+MOg82LKg/1aQomdAdMovAyK
lNvfmXhRmLuu9INOcDIuX8WEjUgzuAcMgni/Yanpalw0iSinmzjjNC+M7r0jrlTSOFSS7mMwrdtF
uM8E+5jwMsTwMwJibGIejyrjERYEHjTojuRJLxwdJjythjlQDhmyFYW7olCbWR7oeSeSftaXxUpA
gPI7SJow3s7aK4kd75DnrcmJwpnxo2+W5xz3Oou3MyapayxKk21cHR8fG08KCQRbgMtnCbaootDM
rS6E6j+L9pGBG5JmCKKBYgjspFiryrE769ly6Eo8rCQzoYOnWVCZGBusdoOSapWxzChFXPFxNVRS
18jt5LS7zmhtlKG1nqfT5k1Yg4X2tjY+/GT7ilM0ihYzIZD/f1eQFMjfET+e120f6AePsCszPYwl
xMVaiXX4Gs1vkbkxl+PmVETttuSw9TjIacpYdUUH+VCoA0O58ua7fE6m0CgB5yPI2JcJh3iQm54U
Ertp0SsH3HmPGJRLDiVPI6/AxrOVlp+kjufNCcC6CWmw8IkhjAbxO2k09aQNdV4wNxQOujCyYRr6
xvA0FTMdOYDXG/zdyi9dXK8RZvuwOGLsxhLec7H13E2sF5zK3kerdSBgNweBnJMVoE0HHh3WPP2v
QTx6QLTTPZ5uhnk1oh2UYNl9Okgt5HiOVUmF8lDhq3P+10KoHpCJonhABzOAzBkORCfAuyA0xZTW
LI4nx+QzJTGRoJ5fWhMYyNANsL+GBYbkMe4UGawmhdckcBFR4aD7O46NE1Dr5lvSOZI39GwlbV2t
9Za6IEUGlh28UO3BqOV2H2rI3rWKW1snPEZI94oTw+A9CwWYTRHa+DH6sQrDzrxUwTCecFso/VaB
xQb85DIwMHLohMkNWqi9QJPse9XnOCH2lpYmwNWQgdCy0mjrJBxVVMJFuBkLcwuwojiZNHwAyuYB
lj5b0NrXYWwmZpKpLumDZMUwG8wTkq1wcomAY8TdaziXS0WV+bhgYY8K3KatSWRD0sQ4JEonNfIF
QPcgd7dNh+HrFAa6lvQcUEVgkxZiDscEMej1MrbfdCuMqRwF2F3fDxiG4ip61jfec4UZk34wpBvG
06hPk3BihYrmYHEjYxI4Gg+RVMEg7iiHFpqJjxaUKMYDcRftJXBkc9TJljdqrA+xxV9p6hFFAcMc
EFHYck59wbDxdAXpEiPLs5ajjvggpRLFchsCjguYJ2rSeFx9Rinh3skEijkYnIriSAhgsweMj65D
z6N4FAwljUV6IPY7l0MRF7BmpLTBFR80/4u5IpwoSHtP6GOA


--===============0771595749==--