bk commit into 4.1 tree (msvensson:1.2563)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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 15:51:52+01:00, msvensson@neptunus.(none) +1 -0
  Some more checks to avoid removing unwanted directories.

  mysql-test/mysql-test-run.pl@stripped, 2006-11-28 15:51:50+01:00, msvensson@neptunus.(none)
+20 -6
    Some more checks to avoid removing unwanted directories.

# 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/my41-work

--- 1.152/mysql-test/mysql-test-run.pl	2006-11-28 15:51:55 +01:00
+++ 1.153/mysql-test/mysql-test-run.pl	2006-11-28 15:51:55 +01:00
@@ -1974,14 +1974,28 @@ sub remove_stale_vardir () {
 sub setup_vardir() {
   mtr_report("Creating Directories");
 
-  if ( $opt_mem )
+  if ( $opt_vardir eq $default_vardir )
   {
-    # Runinng with var as a link to some "memory" location, normally tmpfs
-    mtr_verbose("Creating $opt_mem");
-    mkpath($opt_mem);
+    #
+    # Running with "var" in mysql-test dir
+    #
+    if ( -l $opt_vardir )
+    {
+      #  it's a symlink
 
-    mtr_report("Symlinking 'var' to '$opt_mem'");
-    symlink($opt_mem, $opt_vardir);
+      # Make sure the directory where it points exist
+      mtr_error("The destination for symlink $opt_vardir does not exist")
+	if ! -d readlink($opt_vardir);
+    }
+    elsif ( $opt_mem )
+    {
+      # Runinng with "var" as a link to some "memory" location, normally tmpfs
+      mtr_verbose("Creating $opt_mem");
+      mkpath($opt_mem);
+
+      mtr_report("Symlinking 'var' to '$opt_mem'");
+      symlink($opt_mem, $opt_vardir);
+    }
   }
 
   mkpath("$opt_vardir/log");