mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Change script to avoiud multiple --debug flags when starting master servers
This commit is contained in:
parent
51296b5399
commit
8fb1f824ea
1 changed files with 2 additions and 3 deletions
|
@ -1151,8 +1151,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
|
||||
|
@ -1177,7 +1176,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 \
|
||||
|
|
Loading…
Reference in a new issue