summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
commit244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch)
treeaf138f2b3739a742c0c38173cdc86ec176fc0edd /mysql-test/suite/rpl/t
parent18af13b88ba580562981a190c25da128a2e9db26 (diff)
parent2842c369851a8afc2a944ce6f4f60fa052f20969 (diff)
downloadmariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/rpl/t')
-rw-r--r--mysql-test/suite/rpl/t/mdev_17588.test23
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