diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-08 13:49:47 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-08 13:49:47 -0600 |
| commit | 9820d3bd7ce6b671ef9c2cae15457d28a520b45b (patch) | |
| tree | 87a62ce347d554cb459fd0dce090acaca1c67486 /mysql-test/mysql-test-run.sh | |
| parent | 4c52928bc84a503fed81ebd7cf934a7857491aa5 (diff) | |
| parent | 9fe894f9ca8e356660658461ebc481c0648999b0 (diff) | |
| download | mariadb-git-9820d3bd7ce6b671ef9c2cae15457d28a520b45b.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5cb3da9df25..7ee629e826e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -592,7 +592,7 @@ start_master() if [ -z "$DO_BENCH" ] then master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ - --server-id=1 \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --exit-info=256 \ @@ -609,7 +609,7 @@ start_master() $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" else master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ - --server-id=1 \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --datadir=$MASTER_MYDDIR \ @@ -664,7 +664,7 @@ start_slave() --master-host=127.0.0.1 \ --master-password= \ --master-port=$MASTER_MYPORT \ - --server-id=2" + --server-id=2 --rpl-recovery-rank=2" else master_info=$SLAVE_MASTER_INFO fi |