diff options
Diffstat (limited to 'mysql-test/t/rpl_stm_until.test')
| -rw-r--r-- | mysql-test/t/rpl_stm_until.test | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/mysql-test/t/rpl_stm_until.test b/mysql-test/t/rpl_stm_until.test index 8feb4c781af..942663d3c8c 100644 --- a/mysql-test/t/rpl_stm_until.test +++ b/mysql-test/t/rpl_stm_until.test @@ -30,9 +30,7 @@ sleep 2; wait_for_slave_to_stop; # here table should be still not deleted select * from t1; ---replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 9 # 11 # 23 # 33 # 34 # 35 # ---query_vertical SHOW SLAVE STATUS +source include/show_slave_status.inc; # this should fail right after start start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; @@ -40,18 +38,14 @@ start slave until master_log_file='master-no-such-bin.000001', master_log_pos=29 select * from t1; sleep 2; wait_for_slave_to_stop; ---replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 9 # 11 # 23 # 33 # 34 # 35 # ---query_vertical SHOW SLAVE STATUS +source include/show_slave_status.inc; # try replicate all up to and not including the second insert to t2; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; sleep 2; wait_for_slave_to_stop; select * from t2; ---replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 9 # 11 # 23 # 33 # 34 # 35 # ---query_vertical SHOW SLAVE STATUS +source include/show_slave_status.inc; # clean up start slave; @@ -66,9 +60,8 @@ start slave until master_log_file='master-bin.000001', master_log_pos=776; sleep 2; wait_for_slave_to_stop; # here the sql slave thread should be stopped ---replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 ---replace_column 1 # 9 # 23 # 33 # 34 # 35 # ---query_vertical SHOW SLAVE STATUS +--replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 +source include/show_slave_status.inc; #testing various error conditions --error 1277 |