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

Merge pilot.(none):/data/msvensson/mysql/mysql-5.1-rpl

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/mysql-test-run.pl:
  Merge
This commit is contained in:
unknown
2008-05-09 12:17:00 +02:00
parent 1e1918141b ecc6795c45
commit c0650b3621
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1196,7 +1196,13 @@ sub set_build_thread_ports($) {
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 $use_tmpdir;
if ( defined $opt_tmpdir and -d $opt_tmpdir){
# Create the tempdir in $opt_tmpdir
$use_tmpdir= $opt_tmpdir;
}
my $tmpdir= tempdir(CLEANUP => 0, # Directory removed by this function
DIR => $use_tmpdir);
# #
# Execute "mysqld --no-defaults --help --verbose" to get a # Execute "mysqld --no-defaults --help --verbose" to get a
@ -4086,7 +4092,7 @@ sub gdb_arguments {
# Write $args to gdb init file # Write $args to gdb init file
my $str= join(" ", @$$args); my $str= join(" ", @$$args);
my $gdb_init_file= "$opt_tmpdir/gdbinit.$type"; my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type";
# Remove the old gdbinit file # Remove the old gdbinit file
unlink($gdb_init_file); unlink($gdb_init_file);
@ -4150,7 +4156,7 @@ sub ddd_arguments {
# Write $args to ddd init file # Write $args to ddd init file
my $str= join(" ", @$$args); my $str= join(" ", @$$args);
my $gdb_init_file= "$opt_tmpdir/gdbinit.$type"; my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type";
# Remove the old gdbinit file # Remove the old gdbinit file
unlink($gdb_init_file); unlink($gdb_init_file);