database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge work:/home/bk/mysql-4.0

Browse Source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2001-10-08 13:49:47 -06:00
parent 4c52928bc8 9fe894f9ca
commit 9820d3bd7c
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.sh
View File

@ -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