Merge lp:~percona-dev/percona-server/5.1.54-final-fix-show-slave-status-nolock into lp:percona-server/release-5.1.54-12

[Oleg Tsarev]

final fix test for patch show_slave_status_nolock.patch. Unfortunatelly, SHOW SLAVE STATUS NOLOCK doesn't determenistic, because doesnt' lock mutex. As result we get float result of tests. Now I remove the SHOW SLAVE STATUS NOLOCK output from the test's result

[Aleksandr Kuzminsky (akuzminsky)]

review: Approve

=== modified file 'mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result'
--- mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result	2011-01-06 09:44:49 +0000
+++ mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result	2011-01-06 14:15:09 +0000
@@ -6,18 +6,16 @@
 start slave;
 DROP TABLE IF EXISTS t;
 CREATE TABLE t(id INT);
-INSERT INTO t SELECT SLEEP(5);
+INSERT INTO t SELECT SLEEP(10);
 STOP SLAVE;
-select count(*) from t;
-count(*)
-0
+Warnings:
+Note	1592	Statement may not be safe to log in statement format.
+master	count(*)
+master	1
+slave	count(*)
+slave	0
 SHOW SLAVE STATUS NOLOCK;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
-<STATE>	<HOST>	<USER>	<PORT>	1	master-bin.000001	276	slave-relay-bin.000003	422	master-bin.000001	<Slave_IO_Running>	<Slave_SQL_Running>							0		0	276	577	None		0	No						0	No	0		0	
-select count(*) from t;
-count(*)
-0
 START SLAVE;
-Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+slave	count(*)
+slave	1
 DROP TABLE t;

=== modified file 'mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test'
--- mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test	2011-01-06 09:44:49 +0000
+++ mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test	2011-01-06 14:15:09 +0000
@@ -2,32 +2,46 @@
 --source include/have_binlog_format_statement.inc
 
 connection master;
--- disable_warnings
-DROP TABLE IF EXISTS t;
--- enable_warnings
-CREATE TABLE t(id INT);
-sync_slave_with_master;
+  --disable_warnings
+  DROP TABLE IF EXISTS t;
+  --enable_warnings
+  CREATE TABLE t(id INT);
+  sync_slave_with_master;
 
 connection master;
-send INSERT INTO t SELECT SLEEP(5);
+  send INSERT INTO t SELECT SLEEP(10);
 
 connection slave;
-sleep 2;
-send STOP SLAVE;
-sleep 2;
+  sleep 15;
+  send STOP SLAVE;
+
+connection master;
+  reap;
+
+  --disable_query_log
+  select "master",count(*) from t;
+  --enable_query_log
 
 connection slave1;
-select count(*) from t;
-replace_column 1 <STATE> 2 <HOST> 3 <USER> 4 <PORT> 11 <Slave_IO_Running> 12 <Slave_SQL_Running>;
-SHOW SLAVE STATUS NOLOCK;
-select count(*) from t;
+  --disable_query_log
+  select "slave",count(*) from t;
+  --enable_query_log
+
+  --disable_result_log
+  SHOW SLAVE STATUS NOLOCK;
+  --enable_result_log
 
 connection slave;
-reap;
---source include/wait_for_slave_to_stop.inc
-START SLAVE;
---source include/wait_for_slave_to_start.inc
+  reap;
+
+  --source include/wait_for_slave_to_stop.inc
+  START SLAVE;
+  --source include/wait_for_slave_to_start.inc
+
+  --disable_query_log
+  select "slave",count(*) from t;
+  --enable_query_log
+
 connection master;
-reap;
-DROP TABLE t;
+  DROP TABLE t;
 sync_slave_with_master;