bk commit into 5.0 tree (kent:1.1956)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1956 05/05/15 20:53:19 kent@stripped +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

  mysql-test/mysql-test-run.pl
    1.23 05/05/15 20:52:58 kent@stripped +0 -0
    Auto merged

  client/mysqltest.c
    1.141 05/05/15 20:52:56 kent@stripped +0 -6
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0-compile/RESYNC

--- 1.22/mysql-test/mysql-test-run.pl	2005-05-15 17:36:13 +02:00
+++ 1.23/mysql-test/mysql-test-run.pl	2005-05-15 20:52:58 +02:00
@@ -1019,6 +1019,11 @@
 
   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 @@
   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?