diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-05 10:05:15 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-05 10:05:15 +0100 |
| commit | db2a5783a0f1583120e4e5b5b3ce2078177cd497 (patch) | |
| tree | 75acc9f32a2fd09be9e70d4bcf806a4fee23cbab | |
| parent | 1172c8ae5568374de74037644a9a082722df9fab (diff) | |
| parent | 5f2e2a5c5c3a1c97f4fdc0ad37f9c836efc2b467 (diff) | |
| download | mariadb-git-db2a5783a0f1583120e4e5b5b3ce2078177cd497.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
mysql-test/mysql-test-run.pl:
Auto merged
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6aacbfdf1ad..69878e63332 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -786,6 +786,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"); } |