diff options
author | monty@mashka.mysql.fi <> | 2003-08-19 16:00:12 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-08-19 16:00:12 +0300 |
commit | eb6458cb18ec31e2be09cf6555a24ef3545c4fa0 (patch) | |
tree | 7e42515465680bf9479f44de0c710044aa122610 /mysql-test/mysql-test-run.sh | |
parent | 10c4acfb4f6f4423040bf31332a0542cc5f7d6e5 (diff) | |
download | mariadb-git-eb6458cb18ec31e2be09cf6555a24ef3545c4fa0.tar.gz |
After merge fixes + bugs from last merge
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8800055a3bb..874abdc0c86 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -344,8 +344,8 @@ while test $# -gt 0; do ;; --valgrind) VALGRIND="valgrind --alignment=8 --leak-check=yes --num-callers=16" - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc" + EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb" + EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb" SLEEP_TIME_AFTER_RESTART=10 SLEEP_TIME_FOR_DELETE=60 USE_RUNNING_SERVER="" @@ -998,7 +998,7 @@ start_slave() if [ x$DO_DDD = x1 ] then - $ECHO "set args $master_args" > $GDB_SLAVE_INIT + $ECHO "set args $slave_args" > $GDB_SLAVE_INIT manager_launch $slave_ident ddd -display $DISPLAY --debugger \ "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD elif [ x$DO_GDB = x1 ] |