diff options
| author | monty@mishka.mysql.fi <> | 2005-09-14 03:18:05 +0300 |
|---|---|---|
| committer | monty@mishka.mysql.fi <> | 2005-09-14 03:18:05 +0300 |
| commit | e7d7b2c757cf2a5438a287d6c656f72bdf8d25ed (patch) | |
| tree | 88a12931d94ff919efc20602c27f0d6f6a48aa83 /mysql-test/mysql-test-run.sh | |
| parent | 6985adffc12435f72640c9eeaa6e88ac10ff0585 (diff) | |
| parent | d6ebc3bb34848921c619a0118d53404a9d3ac2db (diff) | |
| download | mariadb-git-e7d7b2c757cf2a5438a287d6c656f72bdf8d25ed.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.mysql.fi:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d9460dcdd72..aadf9080348 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -235,6 +235,7 @@ DO_GDB="" MANUAL_GDB="" DO_DDD="" DO_CLIENT_GDB="" +DO_VALGRIND_MYSQL_TEST="" SLEEP_TIME_AFTER_RESTART=1 SLEEP_TIME_FOR_DELETE=10 SLEEP_TIME_FOR_FIRST_MASTER=400 # Enough time to create innodb tables @@ -432,6 +433,9 @@ while test $# -gt 0; do TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"` VALGRIND="$VALGRIND $TMP" ;; + --valgrind-mysqltest) + DO_VALGRIND_MYSQL_TEST=1 + ;; --skip-ndbcluster | --skip-ndb) USE_NDBCLUSTER="" EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-ndbcluster" @@ -666,7 +670,7 @@ else MYSQL_CLIENT_TEST="$CLIENT_BINDIR/mysql_client_test_embedded" fi else - MYSQL_TEST="$CLIENT_BINDIR/mysqltest" + MYSQL_TEST="$VALGRIND_MYSQLTEST $CLIENT_BINDIR/mysqltest" MYSQL_CLIENT_TEST="$CLIENT_BINDIR/mysql_client_test" fi fi @@ -681,6 +685,10 @@ then SLAVE_MYSQLD=$MYSQLD fi +if [ x$DO_VALGRIND_MYSQL_TEST = x1 ] ; then + MYSQL_TEST="$VALGRIND $MYSQL_TEST" +fi + # If we should run all tests cases, we will use a local server for that if [ -z "$1" ] |