Commit 77b2435e authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
parents 4adab48b 6e021edc

mysql-test/mysql-test-run.sh

+2 −3
Original line number Diff line number Diff line
@@ -1152,8 +1152,7 @@ start_master() 
  fi

  if [ -n "$EXTRA_MASTER_MYSQLD_TRACE" ] 

  then

    EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \

        $EXTRA_MASTER_MYSQLD_TRACE$1"

      CURR_MASTER_MYSQLD_TRACE="$EXTRA_MASTER_MYSQLD_TRACE$1"

  fi

  if [ -z "$DO_BENCH" ]

  then
@@ -1178,7 +1177,7 @@ start_master() 
	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \

           $NOT_FIRST_MASTER_EXTRA_OPTS"

           $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"

  else

    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \

          --server-id=$id --rpl-recovery-rank=1 \