diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
| commit | 4081b7b27a40df6244e0525885cf70e48b7b35bc (patch) | |
| tree | e9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/suite/rpl/t | |
| parent | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff) | |
| parent | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff) | |
| download | mariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/rpl/t')
| -rw-r--r-- | mysql-test/suite/rpl/t/mdev_17588.test | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/mysql-test/suite/rpl/t/mdev_17588.test b/mysql-test/suite/rpl/t/mdev_17588.test index e9a340cbd25..44644158dff 100644 --- a/mysql-test/suite/rpl/t/mdev_17588.test +++ b/mysql-test/suite/rpl/t/mdev_17588.test @@ -1,23 +1,28 @@ --source include/master-slave.inc --source include/have_innodb.inc +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +--source include/start_slave.inc + --connection master create table t1 (a int) engine=innodb; create table t2 (a int); create table t3 (a int) engine=innodb; ---source include/save_master_gtid.inc +--save_master_pos --connection slave # Using ER_UNKNOWN_STORAGE_ENGINE wont work let $slave_sql_errno= 1286; ---source include/wait_for_slave_sql_error.inc ---let $status_items= Last_Error ---source include/show_slave_status.inc -STOP SLAVE IO_THREAD; -source include/wait_for_slave_to_stop.inc; -SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; ---source include/start_slave.inc ---source include/sync_with_master_gtid.inc +--source include/wait_for_slave_sql_error_and_skip.inc +--sync_with_master + +--let $assert_text= Status should be 'Slave has read all relay log...' +--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" +#Like "Slave has read all relay log%" +--source include/rpl_assert.inc + show tables; show create table t2; --error ER_NO_SUCH_TABLE |