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 mysql.com:/home/mydev/mysql-5.0-bug15591

Browse Source 
into  mysql.com:/home/mydev/mysql-5.1-bug15591


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Bug#15591 - Occasional test suite abort due to port in use
  Manual merge.
This commit is contained in:
unknown
2005-12-29 13:37:37 +01:00
parent a23e2eefd2 57b203369f
commit f8df12908c
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1273,6 +1273,7 @@ start_master()
--server-id=$id \
--basedir=$MY_BASEDIR \
--port=$this_master_myport \
--port-open-timeout=380 \
--local-infile \
--exit-info=256 \
--core \
@ -1298,6 +1299,7 @@ start_master()
--server-id=$id --rpl-recovery-rank=1 \
--basedir=$MY_BASEDIR --init-rpl-role=master \
--port=$this_master_myport \
--port-open-timeout=380 \
--local-infile \
--datadir=$MASTER_MYDDIR$1 \
--pid-file=$MASTER_MYPID$1 \
@ -1431,6 +1433,7 @@ start_slave()
--datadir=$slave_datadir \
--pid-file=$slave_pid \
--port=$slave_port \
--port-open-timeout=380 \
--socket=$slave_sock \
--character-sets-dir=$CHARSETSDIR \
--default-character-set=$CHARACTER_SET \