diff options
| author | Sachin <sachin.setiya@mariadb.com> | 2019-07-27 19:57:46 +0530 |
|---|---|---|
| committer | Sachin <sachin.setiya@mariadb.com> | 2019-09-04 17:45:25 +0530 |
| commit | 0e38cd37c7be46ac2b57344476d68a6dc59bc3a4 (patch) | |
| tree | dbdc1bc19ba968e91966c45e19a4d02fedaa5849 | |
| parent | fe4eacde39fd4527f52624162eba7b636549ef31 (diff) | |
| download | mariadb-git-0e38cd37c7be46ac2b57344476d68a6dc59bc3a4.tar.gz | |
MDEV-20137 rpl.mdev_17588 fails in buildbot with "Table doesn't exist"
Fix the test case.
| -rw-r--r-- | mysql-test/suite/rpl/r/mdev_17588.result | 12 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/mdev_17588.test | 23 |
2 files changed, 18 insertions, 17 deletions
diff --git a/mysql-test/suite/rpl/r/mdev_17588.result b/mysql-test/suite/rpl/r/mdev_17588.result index fea28a311b4..acffe96c647 100644 --- a/mysql-test/suite/rpl/r/mdev_17588.result +++ b/mysql-test/suite/rpl/r/mdev_17588.result @@ -1,16 +1,12 @@ include/master-slave.inc [connection master] +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +include/start_slave.inc create table t1 (a int) engine=innodb; create table t2 (a int); create table t3 (a int) engine=innodb; -include/save_master_gtid.inc -include/wait_for_slave_sql_error.inc [errno=1286] -Last_Error = 'Error 'Unknown storage engine 'innodb'' on query. Default database: 'test'. Query: 'create table t1 (a int) engine=innodb'' -STOP SLAVE IO_THREAD; -include/wait_for_slave_to_stop.inc -SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -include/start_slave.inc -include/sync_with_master_gtid.inc +include/wait_for_slave_sql_error_and_skip.inc [errno=1286] show tables; Tables_in_test t2 diff --git a/mysql-test/suite/rpl/t/mdev_17588.test b/mysql-test/suite/rpl/t/mdev_17588.test index e9a340cbd25..c3ecde56139 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 $show_statement= SHOW PROCESSLIST +--let $field= State +--let $condition= 'Slave has read all relay log; waiting for the slave I/O thread to update it'; +--source include/wait_show_condition.inc + show tables; show create table t2; --error ER_NO_SUCH_TABLE |