bk commit into 5.0 tree (msvensson:1.1978)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1978 05/12/07 14:54:06 msvensson@neptunus.(none) +1 -0
  valgrind for mysqltest 

  mysql-test/mysql-test-run.sh
    1.282 05/12/07 14:54:03 msvensson@neptunus.(none) +4 -6
    Dont add valgrind to the MYSQL_TEST variable

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/wl2930/my50-wl2930

--- 1.281/mysql-test/mysql-test-run.sh	2005-12-06 21:34:31 +01:00
+++ 1.282/mysql-test/mysql-test-run.sh	2005-12-07 14:54:03 +01:00
@@ -770,11 +770,6 @@
 SLAVE_MYSQLD=$MYSQLD
 fi
 
-# If mysqltest should be valgrinded, add valgrind and options to MYSQL_TEST
-if ! [ -z "$VALGRIND_MYSQLTEST" ] ; then
-  MYSQL_TEST="$VALGRIND_MYSQLTEST $MYSQL_TEST"
-fi
-
 # If we should run all tests cases, we will use a local server for that
 
 if [ -z "$1" -a -z "$DO_STRESS" ]
@@ -831,7 +826,10 @@
 fi
 MYSQL_TEST_BIN=$MYSQL_TEST
 MYSQL_TEST="$MYSQL_TEST $MYSQL_TEST_ARGS"
+
+# Export MYSQL_TEST variable for use from .test files
 export MYSQL_TEST
+
 GDB_CLIENT_INIT=$MYSQL_TMP_DIR/gdbinit.client
 GDB_MASTER_INIT=$MYSQL_TMP_DIR/gdbinit.master
 GDB_SLAVE_INIT=$MYSQL_TMP_DIR/gdbinit.slave
@@ -1780,7 +1778,7 @@
     $RM -f r/$tname.*reject
     mysql_test_args="-R $result_file $EXTRA_MYSQL_TEST_OPT"
     if [ -z "$DO_CLIENT_GDB" ] ; then
-      `$MYSQL_TEST  $mysql_test_args < $tf 2> $TIMEFILE`;
+      `$VALGRIND_MYSQLTEST $MYSQL_TEST  $mysql_test_args < $tf 2> $TIMEFILE`;
     else
       do_gdb_test "$mysql_test_args" "$tf"
     fi