From: Andrei Elkin
Date: December 21 2010 10:55am
Subject: bzr push into mysql-trunk-bugfixing branch (andrei.elkin:3459)
List-Archive: http://lists.mysql.com/commits/127386
Message-Id: <201012211055.oBLAtmQQ007988@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0568881045=="

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

 3459 Andrei Elkin	2010-12-21 [merge]
      merge from mysql-trunk-bugfixing repo to local branch with bug fixes

    modified:
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/suite/rpl/r/rpl_auto_increment.result
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_record.cc
      sql/rpl_record.h
=== 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;


--===============0568881045==
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: 148f17bd365ebfbc1583c1eec35fbf65b6452757
# timestamp: 2010-12-21 12:55:48 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: dao-gang.qu@stripped\
#   grvnu759ri06q30h
# 
# Begin bundle
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


--===============0568881045==--