diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
| commit | 87eb2cb938382b545158987a1cc6bc170588db3a (patch) | |
| tree | a6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/suite/rpl/t/rpl_flushlog_loop.test | |
| parent | 093a6dd90e12ca41e7e415f57f5a91181bf1959e (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-87eb2cb938382b545158987a1cc6bc170588db3a.tar.gz | |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_flushlog_loop.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_flushlog_loop.test | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test index caead008169..a8befe612c2 100644 --- a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test +++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test @@ -2,7 +2,8 @@ # in case of bi-directional replication -- source include/master-slave.inc ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR/ show variables like 'relay_log%'; connection slave; @@ -24,13 +25,8 @@ stop slave; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=$SLAVE_MYPORT; -start slave; -# -# Wait for start of slave IO and SQL threads -# -let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%0%0%None%'; ---source include/wait_slave_status.inc +source include/start_slave.inc; # # Flush logs of slave @@ -73,3 +69,9 @@ source include/wait_for_slave_param.inc; --replace_result $SLAVE_MYPORT SLAVE_PORT $slave_param_value POSITION --replace_column 1 # 8 # 9 # 16 # 23 # 33 # 34 # 35 # --query_vertical SHOW SLAVE STATUS + +--disable_query_log +connection master; +DROP TABLE t1; +sync_slave_with_master; +--enable_query_log |