database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Resolve opt_vardir in MTR with realpath. Server resolves some directory names, thus

Browse Source 
mtr should do it as well, to avoid differences in test output. 

This fixes sys_vars.secure_file_priv on FreeBSD9.0 buildbot.
This commit is contained in:
Vladislav Vaintroub
2012-05-04 14:46:18 +02:00
parent ab58904367
commit 2cf17b09ed
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/mysql-test-run.pl
View File

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