Skip to content

M
MariaDB
Commit a1725758 authored by msvensson@neptunus.homeip.net's avatar msvensson@neptunus.homeip.net
Browse files
Options

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

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
parents ccb2f338 8fb1f824
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
mysql-test/mysql-test-run.sh
View file @ a1725758
...@@ -1152,8 +1152,7 @@ start_master() ...@@ -1152,8 +1152,7 @@ start_master()
fi fi
if [ -n "$EXTRA_MASTER_MYSQLD_TRACE" ] if [ -n "$EXTRA_MASTER_MYSQLD_TRACE" ]
then then
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \ CURR_MASTER_MYSQLD_TRACE="$EXTRA_MASTER_MYSQLD_TRACE$1"
$EXTRA_MASTER_MYSQLD_TRACE$1"
fi fi
if [ -z "$DO_BENCH" ] if [ -z "$DO_BENCH" ]
then then
...@@ -1178,7 +1177,7 @@ start_master() ...@@ -1178,7 +1177,7 @@ start_master()
$MASTER_40_ARGS \ $MASTER_40_ARGS \
$SMALL_SERVER \ $SMALL_SERVER \
$EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \ $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
$NOT_FIRST_MASTER_EXTRA_OPTS" $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"
else else
master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \ master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
--server-id=$id --rpl-recovery-rank=1 \ --server-id=$id --rpl-recovery-rank=1 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7