diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:21:03 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:21:03 +0200 |
| commit | 6ee54d733ce5a85c82a0c054fa3198caa65512d0 (patch) | |
| tree | 8ada0c559eba3dcd7f44ca1f4996fbaefd680d7c /mysql-test/t/rpl_flush_log_loop.test | |
| parent | 3aa2467ebbf7b86448fa270b3d77e497f9e2dd11 (diff) | |
| parent | 126e351cde084ae36d9e803c740bf07c7054c577 (diff) | |
| download | mariadb-git-6ee54d733ce5a85c82a0c054fa3198caa65512d0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ndb_autodiscover2.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
Diffstat (limited to 'mysql-test/t/rpl_flush_log_loop.test')
| -rw-r--r-- | mysql-test/t/rpl_flush_log_loop.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_flush_log_loop.test b/mysql-test/t/rpl_flush_log_loop.test index b0c6de76878..e08f1a23ef3 100644 --- a/mysql-test/t/rpl_flush_log_loop.test +++ b/mysql-test/t/rpl_flush_log_loop.test @@ -1,15 +1,15 @@ # Testing if "flush logs" command bouncing resulting in logs created in a loop # in case of bi-directional replication -source include/master-slave.inc +source include/master-slave.inc; connection slave; +stop slave; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=$MASTER_MYPORT; start slave; connection master; -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; |