diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-24 02:10:49 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-24 02:10:49 +0300 |
| commit | 839ebeca5ac7c46d53f39d41f57f264767a32c96 (patch) | |
| tree | 3c1a50943610a2b8a03201f53d1c39359fcc6b14 /mysql-test/t | |
| parent | c216222b5a13aae392abc35849a6887a6aa48b1d (diff) | |
| parent | e089fcce4c67a715f3f2f5eec6a6d1b248a41106 (diff) | |
| download | mariadb-git-839ebeca5ac7c46d53f39d41f57f264767a32c96.tar.gz | |
merge with 3.23
BitKeeper/etc/ignore:
auto-union
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_rotate_logs-master.opt:
Auto merged
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
Auto merged
mysql-test/t/rpl_rotate_logs-slave.sh:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/rpl000018.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs-master.opt (renamed from mysql-test/t/rpl000016-master.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs-slave-master-info.opt (renamed from mysql-test/t/rpl000016-slave-master-info.opt) | 0 | ||||
| -rwxr-xr-x | mysql-test/t/rpl_rotate_logs-slave.sh (renamed from mysql-test/t/rpl000016-slave.sh) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test (renamed from mysql-test/t/rpl000016.test) | 0 |
5 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test index 30d601bb375..291b482b912 100644 --- a/mysql-test/t/rpl000018.test +++ b/mysql-test/t/rpl000018.test @@ -1,3 +1,8 @@ +# +# Running test with abort-slave-event-count=1 +# This will force slave to reconnect after every event +# + require_manager; connect (master,localhost,root,,test,0,master.sock); connect (slave,localhost,root,,test,0,slave.sock); diff --git a/mysql-test/t/rpl000016-master.opt b/mysql-test/t/rpl_rotate_logs-master.opt index f27601e0d7d..f27601e0d7d 100644 --- a/mysql-test/t/rpl000016-master.opt +++ b/mysql-test/t/rpl_rotate_logs-master.opt diff --git a/mysql-test/t/rpl000016-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs-slave-master-info.opt index 80190bf6d29..80190bf6d29 100644 --- a/mysql-test/t/rpl000016-slave-master-info.opt +++ b/mysql-test/t/rpl_rotate_logs-slave-master-info.opt diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl_rotate_logs-slave.sh index 9259f593e54..9259f593e54 100755 --- a/mysql-test/t/rpl000016-slave.sh +++ b/mysql-test/t/rpl_rotate_logs-slave.sh diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl_rotate_logs.test index fa0c38ae993..fa0c38ae993 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl_rotate_logs.test |