From 8fb1f824ea3e918527a983ece4988a5c0e0a7431 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.homeip.net" <>
Date: Thu, 10 Feb 2005 14:13:23 +0100
Subject: [PATCH] Change script to avoiud multiple --debug flags when starting
 master servers

---
 mysql-test/mysql-test-run.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c3b27dd9af2..75e2a8c7cc8 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -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 \