From: Andrei Elkin
Date: December 21 2010 10:53am
Subject: bzr commit into mysql-trunk-bugfixing branch (andrei.elkin:3458) Bug#58753
List-Archive: http://lists.mysql.com/commits/127385
X-Bug: 58753
Message-Id: <201012211053.oBLArUgD007947@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0503975377=="

--===============0503975377==
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-bugfixing/ based on revid:sven.sandberg@stripped

 3458 Andrei Elkin	2010-12-21 [merge]
      Bug #58753 	rpl_checksum finds unsuppressed warning
      
      Fixed with deploying a suppression in the test.
      The test provokes the warning by a failure simulation.
      This patch cleans up rpl_checksum as well.

    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-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2010-12-21 10:53:10 +0000
@@ -3,6 +3,7 @@ include/master-slave.inc
 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-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2010-12-21 10:53: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
@@ -94,22 +95,23 @@ set @@global.binlog_checksum = CRC32;
 insert into t1 values (1) /* will not be applied on slave due to simulation */;
 
 # instruction to the dump thread
-### set @@global.debug='d,simulate_slave_unaware_checksum'; # merge todo: +/- d syntax fails in my clone
 
 connection slave;
-set @@global.debug='d,simulate_slave_unaware_checksum'; # merge todo: +/- d syntax fails in my clone
+set @@global.debug='d,simulate_slave_unaware_checksum';
 start slave;
 source include/wait_for_slave_io_to_stop.inc;
 
+let $slave_error_date_col= 17;
 let $errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 let $error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
-let $error= `select substring("$error", 17)`;  # todo:  declare a global const let $slave_error_date_col= 17
+let $error= `select substring("$error", $slave_error_date_col)`;
+
 --echo *** Got IO thread error code: $errno, text: $error ***
 
 select count(*) as zero from t1;
 
 ###connection master;
-set @@global.debug=''; # merge todo: +/- d syntax fails in my clone
+set @@global.debug='';
 
 connection slave;
 source include/start_slave.inc;
@@ -121,10 +123,10 @@ source include/start_slave.inc;
 # C1. Failure by a client thread
 connection master;
 set @@global.master_verify_checksum = 1;
-set @@session.debug='d,simulate_checksum_test_failure'; # merge todo deploy +/- syntax
+set @@session.debug='d,simulate_checksum_test_failure';
 --error ER_ERROR_WHEN_EXECUTING_COMMAND
 show binlog events;
-set @@session.debug=''; # merge todo: +/- d syntax fails in my clone
+set @@session.debug='';
 set @@global.master_verify_checksum = default;
 
 #connection master;
@@ -141,14 +143,14 @@ connection slave;
 
 # C2. Failure by IO thread
 # instruction to io thread
-set @@global.debug='d,simulate_checksum_test_failure'; # merge todo deploy +/- syntax
+set @@global.debug='d,simulate_checksum_test_failure';
 start slave io_thread;
 source include/wait_for_slave_io_to_stop.inc;
 let $errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 let $error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
 let $error= `select substring("$error", 17)`;
 --echo *** Got IO thread error code: $errno, text: $error ***
-set @@global.debug=''; # todo: merge
+set @@global.debug='';
 
 # to make IO thread re-read it again w/o the failure
 start slave io_thread;
@@ -160,7 +162,7 @@ source include/wait_for_slave_param.inc;
 # instruction to sql thread;
 set @@global.slave_sql_verify_checksum = 1;
 
-set @@global.debug='d,simulate_checksum_test_failure'; # merge todo deploy +/- syntax
+set @@global.debug='d,simulate_checksum_test_failure';
 
 start slave sql_thread;
 source include/wait_for_slave_sql_to_stop.inc;


--===============0503975377==
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-\
#   bugfixing/
# testament_sha1: bae45053f0370e6fa2dcca5e9c20fa640d82b42b
# timestamp: 2010-12-21 12:53:30 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: sven.sandberg@stripped\
#   kvt8o8vyr7bg74yw
# 
# Begin bundle
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
YYIVDLiOrUdEKZYhf/F3JFOFCQ3OJMAw


--===============0503975377==--