diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-14 21:29:35 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-14 23:15:59 +0200 |
| commit | fb13616518975b84eea9b9e0d5a91122bb1abe7a (patch) | |
| tree | 6781fd01eea138cbfa07b2ba88d384c9d94e1a34 /mysql-test/suite/rpl/t/rpl_delayed_slave.test | |
| parent | 3011060b2ab8b56a5c1c69695de6041b80a663b7 (diff) | |
| download | mariadb-git-fb13616518975b84eea9b9e0d5a91122bb1abe7a.tar.gz | |
MDEV-7145: Delayed replication.
Add test cases for delayed slave with parallel replication.
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_delayed_slave.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_delayed_slave.test | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_delayed_slave.test b/mysql-test/suite/rpl/t/rpl_delayed_slave.test index e34c46a460c..2400a821e2b 100644 --- a/mysql-test/suite/rpl/t/rpl_delayed_slave.test +++ b/mysql-test/suite/rpl/t/rpl_delayed_slave.test @@ -151,9 +151,13 @@ INSERT INTO t1 SELECT delay_on_slave(2), 4; --let $assert_cond= MAX(b) = 3 FROM t1 --source include/rpl_assert.inc ---let $assert_text= Status should be executing third query (i.e., 'User sleep') ---let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" = "User sleep" ---source include/rpl_assert.inc +let $parallel= `SELECT @@GLOBAL.slave_parallel_threads`; +if (!$parallel) +{ + let $assert_text= Status should be executing third query (i.e., 'User sleep'); + let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" = "User sleep"; + source include/rpl_assert.inc; +} --echo # sleep 2*T --sleep $time2 @@ -414,5 +418,7 @@ DROP FUNCTION delay_on_slave; --echo [on slave] --sync_slave_with_master +SELECT @@GLOBAL.slave_parallel_mode; +SELECT @@GLOBAL.slave_parallel_threads; --source include/rpl_end.inc |