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

Don't symlink var/tmp to $opt_tmpdir

Browse Source 
Just treat var/tmp and $opt_tmndir that might be different or same.
This commit is contained in:
msvensson@pilot.mysql.com
2008-04-23 12:59:37 +02:00
parent ea839ba054
commit 3f9adfb812
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1293,18 +1293,6 @@ sub remove_stale_vardir () {
mtr_error("No, don't remove the vardir when running with --extern") mtr_error("No, don't remove the vardir when running with --extern")
if using_extern(); if using_extern();
my $tmpdir= "$opt_vardir/tmp";
if ( -l $tmpdir)
{
# var/tmp is a symlink
mtr_verbose("Removing " . readlink($tmpdir));
rmtree(readlink($tmpdir));
# Remove the "tmp" symlink
mtr_verbose("unlink($tmpdir)");
unlink($tmpdir);
}
mtr_verbose("opt_vardir: $opt_vardir"); mtr_verbose("opt_vardir: $opt_vardir");
if ( $opt_vardir eq $default_vardir ) if ( $opt_vardir eq $default_vardir )
{ {
@ -1425,11 +1413,9 @@ sub setup_vardir() {
mkpath("$opt_vardir/log"); mkpath("$opt_vardir/log");
mkpath("$opt_vardir/run"); mkpath("$opt_vardir/run");
mkpath($opt_tmpdir); # Create var/tmp and tmp - they might be different
if ($opt_tmpdir ne "$opt_vardir/tmp"){ mkpath("$opt_vardir/tmp");
mtr_report(" - symlinking 'var/tmp' to '$opt_tmpdir'"); mkpath($opt_tmpdir) if ($opt_tmpdir ne "$opt_vardir/tmp");
symlink($opt_tmpdir, "$opt_vardir/tmp");
}
# On some operating systems, there is a limit to the length of a # On some operating systems, there is a limit to the length of a
# UNIX domain socket's path far below PATH_MAX. # UNIX domain socket's path far below PATH_MAX.
@ -2716,10 +2702,13 @@ sub after_test_failure ($) {
} }
} }
# Remove all files in the tmpdir # Remove all files in tmp and var/tmp
rmtree($opt_tmpdir); rmtree("$opt_vardir/tmp");
mkpath($opt_tmpdir); mkpath("$opt_vardir/tmp");
if ($opt_tmpdir ne "$opt_vardir/tmp"){
rmtree($opt_tmpdir);
mkpath($opt_tmpdir);
}
} }