From 2cf17b09edae9ca062cf8c8473a4f01d9e7cffe6 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Fri, 4 May 2012 14:46:18 +0200
Subject: [PATCH] Resolve opt_vardir in MTR with realpath. Server resolves some
 directory names, thus mtr should do it as well, to avoid differences in test
 output.

This fixes sys_vars.secure_file_priv on FreeBSD9.0 buildbot.
---
 mysql-test/mysql-test-run.pl | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fdf34c1c9ec..b913c1810e4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -78,7 +78,8 @@ BEGIN {
 
 use lib "lib";
 
-use Cwd;
+use Cwd ;
+use Cwd 'realpath';
 use Getopt::Long;
 use My::File::Path; # Patched version of File::Path
 use File::Basename;
@@ -1040,8 +1041,14 @@ sub ignore_option {
 # Setup any paths that are $opt_vardir related
 sub set_vardir {
   my ($vardir)= @_;
-
-  $opt_vardir= $vardir;
+  if(IS_WINDOWS)
+  {
+    $opt_vardir= $vardir;
+  }
+  else
+  {
+    $opt_vardir= realpath($vardir);
+  }
 
   $path_vardir_trace= $opt_vardir;
   # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...