bk commit into 5.0 tree (knielsen:1.2146)

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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.2146 06/04/10 13:18:23 knielsen@stripped +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
  into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

  mysql-test/mysql-test-run.pl
    1.87 06/04/10 13:18:20 knielsen@stripped +1 -1
    Manual merge

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.0-tmp/RESYNC

--- 1.86/mysql-test/mysql-test-run.pl	2006-04-07 13:44:38 +02:00
+++ 1.87/mysql-test/mysql-test-run.pl	2006-04-10 13:18:20 +02:00
@@ -2942,11 +2942,6 @@
 
   mtr_init_args(\$args);
 
-  if ( $opt_valgrind_mysqltest )
-  {
-    valgrind_arguments($args, \$exe);
-  }
-
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--silent");
   mtr_add_arg($args, "-v");
@@ -3061,6 +3056,17 @@
   # ----------------------------------------------------------------------
   # Add arguments that should not go into the MYSQL_TEST env var
   # ----------------------------------------------------------------------
+
+  if ( $opt_valgrind_mysqltest )
+  {
+    # Prefix the Valgrind options to the argument list.
+    # We do this here, since we do not want to Valgrind the nested invocations
+    # of mysqltest; that would mess up the stderr output causing test failure.
+    my @args_saved = @$args;
+    mtr_init_args(\$args);
+    valgrind_arguments($args, \$exe);
+    mtr_add_arg($args, "%s", $_) for @args_saved;
+  }
 
   mtr_add_arg($args, "--test-file");
   mtr_add_arg($args, $tinfo->{'path'});