Merge lp:~laurynas-biveinis/percona-server/bug1089265-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

(Trivially) merge bug 1089265 fix from 5.1.
http://jenkins.percona.com/job/percona-server-5.5-param/670/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_percona_crash_resistant_rpl.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_percona_crash_resistant_rpl.result	2012-08-16 13:36:42 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_percona_crash_resistant_rpl.result	2013-02-15 05:15:32 +0000
@@ -11,40 +11,49 @@
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 1
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
+include/stop_slave.inc
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 2
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+include/sync_slave_io_with_master.inc
+include/stop_slave_io.inc
 SET GLOBAL debug="+d,crash_commit_before";
-START SLAVE;
+START SLAVE SQL_THREAD;
 include/rpl_start_server.inc [server_number=2]
 include/start_slave.inc
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 2
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
+include/stop_slave.inc
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 3
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+include/sync_slave_io_with_master.inc
+include/stop_slave_io.inc
 SET GLOBAL debug="+d,crash_innodb_after_prepare";
-START SLAVE;
+START SLAVE SQL_THREAD;
 include/rpl_start_server.inc [server_number=2]
 include/start_slave.inc
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 3
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
+include/stop_slave.inc
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 4
+START SLAVE IO_THREAD;
+include/wait_for_slave_io_to_start.inc
+include/sync_slave_io_with_master.inc
+include/stop_slave_io.inc
 SET GLOBAL debug="+d,crash_innodb_before_commit";
-START SLAVE;
+START SLAVE SQL_THREAD;
 include/rpl_start_server.inc [server_number=2]
 include/start_slave.inc
 SELECT COUNT(*) FROM t1;

=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl.test	2012-08-16 13:44:06 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_percona_crash_resistant_rpl.test	2013-02-15 05:15:32 +0000
@@ -1,6 +1,5 @@
 # Tests for Percona crash-resistant replication feature
 --source include/have_innodb.inc
---source include/master-slave.inc
 --source include/not_valgrind.inc
 --source include/not_crashrep.inc
 --source include/have_debug.inc
@@ -8,17 +7,16 @@
 #
 # Setup
 #
+--source include/master-slave.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Warning: innodb_overwrite_relay_log_info is enabled.");
 --enable_query_log
 
-connection master;
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1 (id INT(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY(id)) ENGINE=InnoDB;
 
 #
@@ -38,20 +36,25 @@
 # Test the crashing case where relay-log.info needs not to be overwritten
 #
 
-STOP SLAVE;
---source include/wait_for_slave_to_stop.inc
+--source include/stop_slave.inc
 
 connection master;
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 
 connection slave;
+# Get the master.info written to the disk before the SQL thread starts and crashes
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+connection master;
+--source include/sync_slave_io_with_master.inc
+--source include/stop_slave_io.inc
+
 SET GLOBAL debug="+d,crash_commit_before";
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
 --error 0,2013
-START SLAVE;
+START SLAVE SQL_THREAD;
 --source include/wait_until_disconnected.inc
---enable_reconnect
 
 --let $rpl_server_number= 2
 --source include/rpl_start_server.inc
@@ -63,20 +66,24 @@
 #
 # Test the rollback of slave position stored in the InnoDB trx header.
 #
-STOP SLAVE;
---source include/wait_for_slave_to_stop.inc
+--source include/stop_slave.inc
 
 connection master;
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 
 connection slave;
+# Get the master.info written to the disk before the SQL thread starts and crashes
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+connection master;
+--source include/sync_slave_io_with_master.inc
+--source include/stop_slave_io.inc
 SET GLOBAL debug="+d,crash_innodb_after_prepare";
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
 --error 0,2013
-START SLAVE;
+START SLAVE SQL_THREAD;
 --source include/wait_until_disconnected.inc
---enable_reconnect
 
 --let $rpl_server_number= 2
 --source include/rpl_start_server.inc
@@ -88,19 +95,23 @@
 #
 # Test crash with XA transaction recovery (bug 1012715)
 #
-STOP SLAVE;
---source include/wait_for_slave_to_stop.inc
+--source include/stop_slave.inc
 connection master;
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM t1;
 
 connection slave;
+# Get the master.info written to the disk before the SQL thread starts and crashes
+START SLAVE IO_THREAD;
+--source include/wait_for_slave_io_to_start.inc
+connection master;
+--source include/sync_slave_io_with_master.inc
+--source include/stop_slave_io.inc
 SET GLOBAL debug="+d,crash_innodb_before_commit";
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
 --error 0,2013
-START SLAVE;
+START SLAVE SQL_THREAD;
 --source include/wait_until_disconnected.inc
---enable_reconnect
 
 --let $rpl_server_number= 2
 --source include/rpl_start_server.inc