diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
| commit | a45ea00b32a71ef5d123e102a7379f7d79a3dbbb (patch) | |
| tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | |
| parent | ad935d47088485c59e6425347307b7b908790e3d (diff) | |
| parent | 619037517f6827131f0f6367df57e28d1b695626 (diff) | |
| download | mariadb-git-a45ea00b32a71ef5d123e102a7379f7d79a3dbbb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_heartbeat_basic.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test index d371d5916c2..838938388db 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test @@ -473,26 +473,22 @@ let $status_var_comparsion= >; # Circular replication --echo *** Circular replication *** # Configure circular replication ---connection master -RESET MASTER; -let $master_binlog= query_get_value(SHOW MASTER STATUS, File, 1); -CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)); ---sync_slave_with_master +--source include/master-slave-reset.inc +--connection slave --source include/stop_slave.inc -RESET MASTER; let $slave_binlog= query_get_value(SHOW MASTER STATUS, File, 1); -RESET SLAVE; ---replace_result $MASTER_MYPORT MASTER_PORT $master_binlog MASTER_BINLOG -eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=0.1, MASTER_LOG_FILE='$master_binlog'; --connection master -RESET SLAVE; --replace_result $SLAVE_MYPORT SLAVE_PORT $slave_binlog SLAVE_BINLOG eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$SLAVE_MYPORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=1, MASTER_LOG_FILE='$slave_binlog'; --source include/start_slave.inc + # Insert data on master and on slave and make sure that it replicated for both directions +CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)); INSERT INTO t1 VALUES(1, 'on master'); --save_master_pos --connection slave +## set slave period 1/10 of master's +CHANGE MASTER TO MASTER_HEARTBEAT_PERIOD=0.1; --source include/start_slave.inc --sync_with_master INSERT INTO t1 VALUES(2, 'on slave'); |