diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-02-04 14:59:04 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-02-04 14:59:04 +0000 |
| commit | 21bcb8e0389b087e10c5ce57edd93bd1a92c6aa9 (patch) | |
| tree | 6eb28832597de9271bc4959aa2bace1feb89910b /mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test | |
| parent | 4e9e30434e46bb81ed87f2b64652e7431517d1ff (diff) | |
| parent | 7c8c7c27b5ff72e17b126e8db0c9e40be9673a15 (diff) | |
| download | mariadb-git-21bcb8e0389b087e10c5ce57edd93bd1a92c6aa9.tar.gz | |
BUG#59147: automerge mysql-5.1 into mysql-5.5.
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index 888f09fcfa1..750f399ce99 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -178,7 +178,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 3 ORDER BY a,b; source include/stop_slave.inc; --connection server_3 DELETE FROM t1 WHERE a = 6; -START SLAVE; +--source include/start_slave.inc --connection server_2 --sync_slave_with_master server_3 RESET MASTER; @@ -192,7 +192,7 @@ RESET SLAVE; --source include/rpl_change_topology.inc #--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $file_d LOG_FILE $pos_d LOG_POS #--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SERVER_MYPORT_3,master_user='root',master_log_file='$file_d',master_log_pos=$pos_d -START SLAVE; +--source include/start_slave.inc --connection server_3 --sync_slave_with_master server_4 --source include/rpl_sync.inc |