Skip to content
Permalink
Browse files

MDEV-7643 MTR creates nested links when tests are run with --mem

1) fix 5.5.42 vs 5.5.41 problem, nested links;
2) fix older MariaDB vs MySQL problem, var_auto_** dirs were not
   removed from the tmpfs location.
Both problems were caused by vardir being expanded to real path
too early, in two different places in the script code
  • Loading branch information...
elenst committed Mar 2, 2015
1 parent 17a3779 commit 34f37aa0c0aa87cfb6908500e937516ff37ea6f0
Showing with 6 additions and 18 deletions.
  1. +6 −18 mysql-test/mysql-test-run.pl
@@ -1024,15 +1024,7 @@ sub ignore_option {

# Setup any paths that are $opt_vardir related
sub set_vardir {
my ($vardir)= @_;
if(IS_WINDOWS)
{
$opt_vardir= $vardir;
}
else
{
$opt_vardir= realpath($vardir);
}
($opt_vardir)= @_;

$path_vardir_trace= $opt_vardir;
# Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
@@ -1486,15 +1478,11 @@ sub command_line_setup {
# --------------------------------------------------------------------------
# Set the "var/" directory, the base for everything else
# --------------------------------------------------------------------------
if(defined $ENV{MTR_BINDIR})
{
$default_vardir= "$ENV{MTR_BINDIR}/mysql-test/var";
}
else
{
$default_vardir= "$glob_mysql_test_dir/var";
}
$default_vardir = realpath $default_vardir unless IS_WINDOWS;
my $vardir_location= (defined $ENV{MTR_BINDIR}
? "$ENV{MTR_BINDIR}/mysql-test"
: $glob_mysql_test_dir);
$vardir_location= realpath $vardir_location unless IS_WINDOWS;
$default_vardir= "$vardir_location/var";

if ( ! $opt_vardir )
{

0 comments on commit 34f37aa

Please sign in to comment.
You can’t perform that action at this time.