From 5a19f3bc71b9db630fac01561ffc6f37434ac509 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@mysql.com>
Date: Sat, 8 Apr 2006 22:27:43 +0200
Subject: [PATCH 1/3] $MYSQL_TEST was broken with --valgrind.

---
 mysql-test/mysql-test-run.pl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 53bf820cce9..20bb6e0117a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2316,11 +2316,6 @@ sub run_mysqltest ($) {
 
   mtr_init_args(\$args);
 
-  if ( defined $opt_valgrind_mysqltest )
-  {
-    valgrind_arguments($args, \$exe);
-  }
-
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'});
   mtr_add_arg($args, "--database=test");
@@ -2398,6 +2393,17 @@ sub run_mysqltest ($) {
   # Add arguments that should not go into the MYSQL_TEST env var
   # ----------------------------------------------------------------------
 
+  if ( defined $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, "-R");
   mtr_add_arg($args, $tinfo->{'result_file'});
 

From c48ded66d39abe1f62e53a403ca37a601552f58d Mon Sep 17 00:00:00 2001
From: unknown <knielsen@mysql.com>
Date: Mon, 10 Apr 2006 09:31:46 +0200
Subject: [PATCH 2/3] Fix test case 'cast' on Windows, different floating point
 output format.

---
 mysql-test/t/cast.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test
index 7e09f44397c..533da542855 100644
--- a/mysql-test/t/cast.test
+++ b/mysql-test/t/cast.test
@@ -171,6 +171,8 @@ select cast(1.0e+300 as signed int);
 CREATE TABLE t1 (f1 double);
 INSERT INTO t1 SET f1 = -1.0e+30 ;
 INSERT INTO t1 SET f1 = +1.0e+30 ;
+# Expected result is +-1e+30, but Windows returns +-1e+030.
+--replace_result 1e+030 1e+30
 SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
 DROP TABLE t1;					   
 

From 7897a3613ac25525fedf5996e282163fff8354a3 Mon Sep 17 00:00:00 2001
From: unknown <aivanov@mysql.com>
Date: Mon, 10 Apr 2006 22:44:01 +0400
Subject: [PATCH 3/3] Fixed test case result (after BUG#15868 fix).

---
 mysql-test/r/innodb.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index e8af68a6067..c5658d22eb6 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1821,7 +1821,7 @@ Variable_name	Value
 innodb_sync_spin_loops	20
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
-innodb_thread_concurrency	0
+innodb_thread_concurrency	8
 set global innodb_thread_concurrency=1001;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value