MWL#180: merge fixes from 5.2-rpl + forgot to adjust revision from which...

MWL#180: merge fixes from 5.2-rpl + forgot to adjust revision from which checksums are supported when merging into 5.3-based tree.

client/CMakeLists.txt

@@ -58,6 +58,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc
 			   ../mysys/my_bitmap.c
 			   ../mysys/my_vle.c
 			   ../mysys/base64.c
+			   ../mysys/checksum.c
 			   DESTINATION bin)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient_notls wsock32)
 

mysql-test/suite/rpl/r/rpl_checksum.result

@@ -61,8 +61,8 @@ set @@global.binlog_checksum = CRC32;
 insert into t1 values (1) /* will not be applied on slave due to simulation */;
 set @@global.debug='d,simulate_slave_unaware_checksum';
 start slave;
-include/wait_for_slave_io_to_stop.inc
-*** Got IO thread error code: 1236, text: Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log' ***
+include/wait_for_slave_io_error.inc [errno=1236]
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log''
 select count(*) as zero from t1;
 zero
 0
@@ -78,16 +78,16 @@ include/stop_slave.inc
 create table t2 (a int);
 set @@global.debug='d,simulate_checksum_test_failure';
 start slave io_thread;
-include/wait_for_slave_io_to_stop.inc
-*** Got IO thread error code: 1595, text: Relay log write failure: could not queue event from master ***
+include/wait_for_slave_io_error.inc [errno=1595]
+Last_IO_Error = 'Relay log write failure: could not queue event from master'
 set @@global.debug='';
 start slave io_thread;
 include/wait_for_slave_param.inc [Read_Master_Log_Pos]
 set @@global.slave_sql_verify_checksum = 1;
 set @@global.debug='d,simulate_checksum_test_failure';
 start slave sql_thread;
-include/wait_for_slave_sql_to_stop.inc
-*** Got SQL thread error code: 1593, text: Error initializing relay log position: I/O error reading event at position 4 ***
+include/wait_for_slave_sql_error.inc [errno=1593]
+Last_SQL_Error = 'Error initializing relay log position: I/O error reading event at position 4'
 set @@global.debug='';
 include/start_slave.inc
 select count(*) as 'must be zero' from t2;

mysql-test/suite/rpl/t/rpl_checksum.test

@@ -95,21 +95,18 @@ 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 $errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
-let $error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
---echo *** Got IO thread error code: $errno, text: $error ***
+--let $slave_io_errno= 1236
+--let $show_slave_io_error= 1
+source include/wait_for_slave_io_error.inc;
 
 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 +118,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,13 +138,12 @@ 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);
---echo *** Got IO thread error code: $errno, text: $error ***
-set @@global.debug=''; # todo: merge
+--let $slave_io_errno= 1595
+--let $show_slave_io_error= 1
+source include/wait_for_slave_io_error.inc;
+set @@global.debug='';
 
 # to make IO thread re-read it again w/o the failure
 start slave io_thread;
@@ -159,13 +155,12 @@ 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;
-let $errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
-let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
---echo *** Got SQL thread error code: $errno, text: $error ***
+--let $slave_sql_errno= 1593
+--let $show_slave_sql_error= 1
+source include/wait_for_slave_sql_error.inc;
 
 # resuming SQL thread to parse out the event w/o the failure
 
@@ -237,6 +232,25 @@ drop table t1, t2, t3;
 set @@global.binlog_checksum = @master_save_binlog_checksum;
 set @@global.master_verify_checksum = @save_master_verify_checksum;
 
+#
+# BUG#58564: flush_read_lock fails in mysql-trunk-bugfixing after merging with WL#2540
+#
+# Sanity check that verifies that no assertions are triggered because
+# of old FD events (generated by versions prior to server released with 
+# checksums feature)
+#
+# There is no need for query log, if something wrong this should trigger
+# an assertion
+
+--disable_query_log
+
+BINLOG '
+MfmqTA8BAAAAZwAAAGsAAAABAAQANS41LjctbTMtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAx+apMEzgNAAgAEgAEBAQEEgAAVAAEGggAAAAICAgCAA==
+';
+
+--enable_query_log
+
 #connection slave;
 sync_slave_with_master;
 set @@global.binlog_checksum = @slave_save_binlog_checksum;