From: Andrei Elkin
Date: December 6 2010 1:08pm
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3210) Bug#58753
List-Archive: http://lists.mysql.com/commits/126133
X-Bug: 58753
Message-Id: <201012061308.oB6D8M4Z007677@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1189691917=="

--===============1189691917==
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:alexander.nozdrin@stripped

 3210 Andrei Elkin	2010-12-06
      Bug #58753 rpl_checksum finds unsuppressed warning
      
      Suppressed a warning allowed by the test's logics.
     @ mysql-test/suite/rpl/r/rpl_checksum.result
        results are updated.
     @ mysql-test/suite/rpl/t/rpl_checksum.test
        suppression is added.

    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	2010-10-28 10:45:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2010-12-06 13:08:10 +0000
@@ -7,6 +7,7 @@ start slave;
 call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log');
 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('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	2010-11-29 16:07:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2010-12-06 13:08:10 +0000
@@ -9,6 +9,7 @@ call mtr.add_suppression('Slave can not 
 call mtr.add_suppression('Replication event checksum verification failed');
 # due to C failure simulation
 call mtr.add_suppression('Relay log write failure: could not queue event from master');
+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


--===============1189691917==
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: 7d50106b22f5328b1f332a53f128bb307094e5fe
# timestamp: 2010-12-06 15:08:22 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   6x94l4fmslpbttxj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaIeVdUAAlZfgEAQWOf//3IC
CAC////wUAVsvYnNtY5jWpsdZUCSUxT1MpsUeKenogj1J+pqfoo0aNGTTBJUyEzR6U9NKeoybU0A
AAADCSERoCDSY0RPJGhoyeowmgDAaAAAaAAAAAAJIkyaNGhGjUxJ6jTanqmjygaZDaOWle3fiw3n
K/+DX61LAurAeMjVhTQ+Dnbnvra00KRmZM3l9kfmVVzp72TlwxXX46726yLjoSGKzeefl/aT9jgW
ep1DEnLzEdb4KywwmFhdIdSfyrJFFm4i62Bu19EOZBlMZk9g+WZeQEyE5XMtFv7J425CyOWgG/wV
sIjYkxLd0EQWaIMjcY0tKMSta5S66JMwMgbscWrJ3SBkKYmWTGQsqyJVKQ+oUAVbgO23Y6kmLCpo
NPpBYzUxREOPc7Sfi4ExdGQvCB7H1GNxvtK27CfOuU0jJMLRe8VthmBeGpkvthTUiWktT0eIuX1l
MqMq3YjkTEyOBnrusrS7b1SCCROwZ0xyFVfcDaIr7xztrZZSjGe8Ny8ksLaqNdL4AZCwL5OFVmaJ
YlNnXnMvDCgxFREe57LfkPXCw0wsmq3FOZaqybaVxMogQhqxF7oMVKu28noNp/nnu0Y5lk5NsZo3
HR71y0mR2S7gG2t6PalbisSAFTWpftPyvibxqUDGw7AXHx3bWQViaMmLdTP0yUi/TN4Pb/wdoWoW
3N90gIFdXPWL32ETUvTT3HiaSuz0CcN7SNgO19vU4oyK7t3FQ6aKsTTz4OxB1ZiqexYQ6sKq4bSa
a2pJpKFSqtpBMcjJnhTRSVH8TX4rZmVnxM4ZmW78HbPvYFwtKMwzHrD3/UnmkSK2MRkRZ3wSFiTs
1FQu/lzyHmcOYlmT0yK1BHxG5cqie0t15qOBimJvSc5UbEvvs+x6ndiNviTUG86eNJIzNTcOJnpq
6F+lavWaWuw2OHnE8/xzPVzpH72jCOEPkhOJdxLSRWUlMZQ4Dj17vYZGprcO3TUoFIUC8vI2ogcN
hvT1ZjepymoWkrV9HikdE1/KgFanw/R0B8yNPbycxNOFZbZnmZeiwfEL0QaRLh8u7IjTUWZ8niMt
TSoka7Ik3V7PaIiWr1SYVDANXjzkS55nFQRagdnF8AZHFQRPB/Ube7HE4ksoxV3WpHM1ZDFi5KBM
OyE1r/Fnk1QD8aHjaQXm4+wnV8ELFGSRYd325DZefckyGjer0j6Djt8yhMJQ7ap9h6YWQ6i0DDIq
TLFl3omDsO+z8c6CTlYLE23QSJI3QQoPD4WZEXAKrlSivqnUx+6IVRxz5rESYUKY3nQQ5I4vv4rG
5QjQg+DL4oTCOwD81cRVDXvKMV5LE7QXQ5gXk0u7DoTWmN+8ih17MIckmC7Iz5CwYXUUxzA+algK
9gGWdANPEG2qv4FsvFJXCOzkT2ErUWra5YBlCD1sYr19F4so7HFArllG5RsSWRT0yE6Li6qJHh2z
IL6MsEg0lQ+SQ6VBsEdEYnvmp24UVlymWmFT9BYlvo7YO7M71F9tng6zUMesyDQxJZG91OUk7EYF
/Pm6wKlUhygW0M1t1HsjFCOBgi03lCIt6FH3NYdRely4hyOuoyZXTwgdKTO4JLaOxKklt2a2W4mP
APsoUJJtHPIg5TDBFVXwHri4XsGFyyXK8+sZwDZkguxH/DBqVwLsVzDQZH7dwJ0ODBjPqpr7arIU
EdbcsnP5A0RtOeAFd2rq9bASuA/Iu5IpwoSFEPKuqA==


--===============1189691917==--