diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
| commit | 75689af808d935de69a39138e35cde575c982251 (patch) | |
| tree | c2668ecbca1fc441f2a39eb25cbb54f16181414a /mysql-test/t/rpl_log_pos.test | |
| parent | 3955e94c34d638df24c5d640558a5aee14342603 (diff) | |
| parent | 54c531607df9b14f206fa8a44f39f2764f55ac82 (diff) | |
| download | mariadb-git-75689af808d935de69a39138e35cde575c982251.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_log_pos.test')
| -rw-r--r-- | mysql-test/t/rpl_log_pos.test | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test index b98d89c1dc3..2c6c1d9868d 100644 --- a/mysql-test/t/rpl_log_pos.test +++ b/mysql-test/t/rpl_log_pos.test @@ -14,31 +14,29 @@ source include/master-slave.inc; --replace_column 3 <Binlog_Ignore_DB> show master status; sync_slave_with_master; ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; -stop slave; -change master to master_log_pos=75; -start slave; -sleep 5; + stop slave; +--source include/wait_for_slave_to_stop.inc change master to master_log_pos=75; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +query_vertical show slave status; + start slave; -sleep 5; ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +let $slave_param= Slave_SQL_Running; +let $slave_param_value= Yes; +--source include/wait_for_slave_param.inc +let $slave_param= Slave_IO_Running; +let $slave_param_value= No; +--source include/wait_for_slave_param.inc stop slave; -change master to master_log_pos=178; -start slave; -sleep 2; +--source include/wait_for_slave_to_stop.inc + --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 11 # 23 # 33 # -show slave status; +--replace_column 1 # 8 # 9 # 23 # 33 # +query_vertical show slave status; + connection master; --replace_column 3 <Binlog_Ignore_DB> show master status; @@ -48,7 +46,6 @@ create table t1 (n int); insert into t1 values (1),(2),(3); save_master_pos; connection slave; -stop slave; change master to master_log_pos=106; start slave; sync_with_master; @@ -57,4 +54,4 @@ connection master; drop table t1; sync_slave_with_master; -# End of 4.1 tests +--echo End of 5.0 tests |