diff options
| author | unknown <kent@mysql.com> | 2005-05-15 20:53:19 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-15 20:53:19 +0200 |
| commit | 0697f1d103b9698023da77fadd5da363d8456143 (patch) | |
| tree | a4eeaa6b45a8684dd2dd8ab6066c336707fbc871 | |
| parent | f4038de74b478190ae341982076302374754281a (diff) | |
| parent | 8fd8d819d0ee7f048b6a40b6e96f0d5e23c0943f (diff) | |
| download | mariadb-git-0697f1d103b9698023da77fadd5da363d8456143.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 95ad51a97eb..52ffff088b5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1019,6 +1019,11 @@ sub kill_and_cleanup () { mtr_report("Removing Stale Files"); + if ( -l $opt_vardir and ! unlink($opt_vardir) ) + { + mtr_error("Can't remove soft link \"$opt_vardir\""); + } + rmtree("$opt_vardir/log"); rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port"); rmtree("$opt_vardir/run"); @@ -1027,10 +1032,7 @@ sub kill_and_cleanup () { mkpath("$opt_vardir/log"); mkpath("$opt_vardir/run"); mkpath("$opt_vardir/tmp"); - if ( $opt_tmpdir ne "$opt_vardir/tmp" ) - { - mkpath($opt_tmpdir); - } + mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp"; # FIXME do we really need to create these all, or are they # created for us when tables are created? |