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

Bug#36463 mysql-test-run.pl should always use the --tmpdi

mysql-test/mysql-test-run.pl:
  Use the requested tmpdir in 'collect_mysqld_features', create
  it if it does not already exists
This commit is contained in:
unknown
2008-05-02 09:13:43 +02:00
parent b9efbe4890
commit 9018c56ac4

View File

@ -1367,7 +1367,15 @@ sub datadir_list_setup () {
sub collect_mysqld_features () {
my $found_variable_list_start= 0;
my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
my $tmpdir;
if ( $opt_tmpdir ) {
# Use the requested tmpdir
mkpath($opt_tmpdir) if (! -d $opt_tmpdir);
$tmpdir= $opt_tmpdir;
}
else {
$tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
}
#
# Execute "mysqld --no-defaults --help --verbose" to get a
@ -1428,7 +1436,7 @@ sub collect_mysqld_features () {
}
}
}
rmtree($tmpdir);
rmtree($tmpdir) if (!$opt_tmpdir);
mtr_error("Could not find version of MySQL") unless $mysql_version_id;
mtr_error("Could not find variabes list") unless $found_variable_list_start;