bk commit into 4.1 tree (msvensson:1.2597)

[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-10-23 16:51:48+02:00, msvensson@neptunus.(none) +1 -0
  The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.

  mysql-test/mysql-test-run.pl@stripped, 2006-10-23 16:51:47+02:00, msvensson@neptunus.(none) +7 -3
    The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.

# 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/mysql-4.1-maint

--- 1.125/mysql-test/mysql-test-run.pl	2006-10-23 16:51:52 +02:00
+++ 1.126/mysql-test/mysql-test-run.pl	2006-10-23 16:51:52 +02:00
@@ -758,15 +758,19 @@
     $opt_vardir= $default_vardir;
   }
   elsif ( $mysql_version_id < 50000 and
-	  ! $glob_win32 and # No supported on platforms without native symlink
 	  $opt_vardir ne $default_vardir)
   {
     # Version 4.1 and --vardir was specified
     # Only supported as a symlink from var/
     # by setting up $opt_mem that symlink will be created
-    $opt_mem= $opt_vardir;
+    if ( ! $glob_win32 )
+    {
+      # Only platforms that have native symlinks can use the vardir trick
+      $opt_mem= $opt_vardir;
+      mtr_report("Using 4.1 vardir trick");
+    }
+
     $opt_vardir= $default_vardir;
-    mtr_report("Using 4.1 vardir trick");
   }
 
   $path_vardir_trace= $opt_vardir;