bk commit into 5.0 tree (msvensson:1.2346)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2006-11-28 16:25:41+01:00, msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
  into  neptunus.(none):/home/msvensson/mysql/work/my50-work
  MERGE: 1.1616.2850.10

  mysql-test/mysql-test-run.pl@stripped, 2006-11-28 16:25:37+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.8.17.8

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/work/my50-work/RESYNC

--- 1.170/mysql-test/mysql-test-run.pl	2006-11-28 16:25:46 +01:00
+++ 1.171/mysql-test/mysql-test-run.pl	2006-11-28 16:25:46 +01:00
@@ -2003,26 +2003,35 @@ sub remove_stale_vardir () {
     if ( -l $opt_vardir)
     {
       # var is a symlink
-      if ( readlink($opt_vardir) eq $opt_mem )
+
+      if ( $opt_mem and readlink($opt_vardir) eq $opt_mem )
       {
 	# Remove the directory which the link points at
 	mtr_verbose("Removing " . readlink($opt_vardir));
 	rmtree(readlink($opt_vardir));
 
-	# Remove the entire "var" dir
-	mtr_verbose("Removing $opt_vardir/");
-	rmtree("$opt_vardir/");
-
 	# Remove the "var" symlink
 	mtr_verbose("unlink($opt_vardir)");
 	unlink($opt_vardir);
       }
+      elsif ( $opt_mem )
+      {
+	# Just remove the "var" symlink
+	mtr_report("WARNING: Removing '$opt_vardir' symlink it's wrong");
+
+	mtr_verbose("unlink($opt_vardir)");
+	unlink($opt_vardir);
+      }
       else
       {
 	# Some users creates a soft link in mysql-test/var to another area
 	# - allow it, but remove all files in it
 
 	mtr_report("WARNING: Using the 'mysql-test/var' symlink");
+
+	# Make sure the directory where it points exist
+	mtr_error("The destination for symlink $opt_vardir does not exist")
+	  if ! -d readlink($opt_vardir);
 
 	my $dir=       shift;
 	foreach my $bin ( glob("$opt_vardir/*") )