- rel 3; update percona patches

[packages/mysql.git] / show_slave_status_nolock.patch

diff --git a/show_slave_status_nolock.patch b/show_slave_status_nolock.patch
index 293925e42daa898c5609127c840702beffe684da..9ed13a967a89d9d7db62b734f5346615503b07bc 100644 (file)
--- a/show_slave_status_nolock.patch
+++ b/show_slave_status_nolock.patch
@@ -106,3 +106,84 @@
          | QUERY_RESPONSE_TIME_SYM wild_and_where
           {
  #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
+--- /dev/null
++++ b/mysql-test/r/percona_show_slave_status_nolock.result
+@@ -0,0 +1,21 @@
++include/master-slave.inc
++[connection master]
++DROP TABLE IF EXISTS t;
++CREATE TABLE t(id INT);
++INSERT INTO t SELECT SLEEP(10);
++STOP SLAVE;
++Warnings:
++Note  1592    Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
++master        count(*)
++master        1
++slave count(*)
++slave 0
++SHOW SLAVE STATUS NOLOCK;
++include/wait_for_slave_to_stop.inc
++START SLAVE;
++include/wait_for_slave_to_start.inc
++slave count(*)
++slave 1
++DROP TABLE t;
++STOP SLAVE;
++include/wait_for_slave_to_stop.inc
+--- /dev/null
++++ b/mysql-test/t/percona_show_slave_status_nolock.test
+@@ -0,0 +1,53 @@
++--source include/master-slave.inc
++--source include/have_binlog_format_statement.inc
++--disable_query_log
++call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement:");
++call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
++--enable_query_log
++connection 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(10);
++
++connection slave;
++  sleep 15;
++  send STOP SLAVE;
++
++connection master;
++  reap;
++
++  --disable_query_log
++  select "master",count(*) from t;
++  --enable_query_log
++
++connection slave1;
++  --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
++
++  --disable_query_log
++  select "slave",count(*) from t;
++  --enable_query_log
++
++connection master;
++  DROP TABLE t;
++sync_slave_with_master;
++STOP SLAVE;
++--source include/wait_for_slave_to_stop.inc
++ 
+\ No newline at end of file