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

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2008-05-02 09:15:23 +02:00
parent 9418fd20d5 9018c56ac4
commit f508244ded
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1378,7 +1378,15 @@ sub datadir_list_setup () {
sub collect_mysqld_features () { sub collect_mysqld_features () {
my $found_variable_list_start= 0; 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 # Execute "mysqld --no-defaults --help --verbose" to get a
@ -1439,7 +1447,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 version of MySQL") unless $mysql_version_id;
mtr_error("Could not find variabes list") unless $found_variable_list_start; mtr_error("Could not find variabes list") unless $found_variable_list_start;