bzr push into mysql-trunk-bugfixing branch (andrei.elkin:3459)

[Andrei Elkin]

 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;


Attachment: [text/bzr-bundle] bzr/[e-mail]