Merge lp:~percona-dev/percona-server/5.1.57-fix_bug_784378 into lp:~percona-dev/percona-server/5.1.57

[Oleg Tsarev]

Post-run check of test percona_slow_extended-slave_innodb_stats was failing because slave didn't stop sometimes.
I added "--source include/rpl_end.inc" to the end of the test and now test works fine.
Also I removed reconnect to server during query execution, because otherwise test failed in "--source include/rpl_end.inc".
For test enough just restart slave.
This fixes bug #784378

[Alexey Kopytov (akopytov)]

Oleg,

You can simply use "--source include/rpl_end.inc" which does STOP SLAVE, includes wait_for_slave_to_stop.inc and does a bunch of other things to make replication tests more robust.

review: Needs Fixing

[Valentine Gostev (longbow)]

ok for me

review: Approve (qa)

=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result	2011-02-26 09:03:28 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result	2011-05-26 11:04:29 +0000
@@ -15,6 +15,7 @@
 START SLAVE;
 include/wait_for_slave_to_start.inc
 INSERT INTO t SELECT t.id,t.data from t;
-DROP TABLE IF EXISTS t;
 FLUSH LOGS;
 4
+DROP TABLE IF EXISTS t;
+include/rpl_end.inc

=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test	2011-05-26 11:04:29 +0000
@@ -20,16 +20,6 @@
 connection slave;
 STOP SLAVE;
 -- source include/wait_for_slave_to_stop.inc
---write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
-wait
-EOF
---shutdown_server 10
---source include/wait_until_disconnected.inc
---append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
-restart
-EOF
---enable_reconnect
---source include/wait_until_connected_again.inc
 START SLAVE;
 -- source include/wait_for_slave_to_start.inc
 
@@ -37,12 +27,12 @@
 INSERT INTO t SELECT t.id,t.data from t;
 sync_slave_with_master;
 
-connection master;
-DROP TABLE IF EXISTS t;
-sync_slave_with_master;
-
 connection slave;
 FLUSH LOGS;
 --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
 --let grep_pattern =  InnoDB_IO_r_ops
 --source include/grep.inc
+
+connection master;
+DROP TABLE IF EXISTS t;
+--source include/rpl_end.inc