Commit bc6207ee authored by unknown's avatar unknown
Browse files

mysql-test-run.sh: 

  test


mysql-test/mysql-test-run.sh:
  test
parent 0a98e390

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH 
MASTER_RUNNING=0

MASTER1_RUNNING=0

MASTER_MYPORT=9306

MASTER_MYPORT1=9307

SLAVE_RUNNING=0

SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests

MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves
@@ -431,6 +432,7 @@ MANAGER_PID_FILE="$MYRUN_DIR/manager.pid" 


MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data"

MASTER_MYSOCK="$MYSQL_TMP_DIR/master.sock"

MASTER_MYSOCK1=$MYSQL_MYSOCK"1"

MASTER_MYPID="$MYRUN_DIR/master.pid"

MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/master.log"

MASTER_MYERR="$MYSQL_TEST_DIR/var/log/master.err"
@@ -444,7 +446,7 @@ SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/slave.err" 
CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test"

SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"



export MASTER_MYPORT SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK

export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1



if [ x$SOURCE_DIST = x1 ] ; then

 MY_BASEDIR=$MYSQL_TEST_DIR