From 5f2e2a5c5c3a1c97f4fdc0ad37f9c836efc2b467 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Dec 2006 10:03:24 +0100 Subject: [PATCH] re-enable multiple test runs in sequence for 4.1 on non-windows mysql-test/mysql-test-run.pl: delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence --- 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"); }