From 792adb7ce39c1e3c3b9cc2a7bffad0d364211da1 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 23 Oct 2006 16:51:48 +0200
Subject: [PATCH] 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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c36a06f56ef..84d84cf8f14 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -758,15 +758,19 @@ sub command_line_setup () {
     $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;