From 6541302bb2841af6f24070ec0e8371ac064834c6 Mon Sep 17 00:00:00 2001
From: "df@kahlann.erinye.com" <>
Date: Tue, 5 Dec 2006 10:03:24 +0100
Subject: [PATCH 1/2] re-enable multiple test runs in sequence for 4.1 on
 non-windows

---
 mysql-test/mysql-test-run.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index a734408e049..569df9dd90f 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -820,6 +820,9 @@ sub command_line_setup () {
     {
       # Only platforms that have native symlinks can use the vardir trick
       $opt_mem= $opt_vardir;
+      # Delete the default directory in case it exists since we're going to create
+      # a new one later anyway, and the mkpath below throws a fatal error otherwise
+      eval { rmtree($default_vardir, 1, 1); };
       mtr_report("Using 4.1 vardir trick");
     }
 

From be212d34863ffdd0ab5dba1f633f69a9df0510ef Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 5 Dec 2006 19:13:31 +0100
Subject: [PATCH 2/2] Remove hack that removes vardir

---
 mysql-test/mysql-test-run.pl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 21824cc69ee..5002f778da5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -802,9 +802,6 @@ sub command_line_setup () {
     {
       # Only platforms that have native symlinks can use the vardir trick
       $opt_mem= $opt_vardir;
-      # Delete the default directory in case it exists since we're going to create
-      # a new one later anyway, and the mkpath below throws a fatal error otherwise
-      eval { rmtree($default_vardir, 1, 1); };
       mtr_report("Using 4.1 vardir trick");
     }