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

Rename "shutdown" -> "send_shutdown" and "kill_server" to "shutdown_server"

Browse Source 
Fix warnings


mysql-test/mysql-test-run.pl:
  Symlink var/tmp to $opt_tmpdir if not using var/tmp
mysql-test/include/restart_mysqld.inc:
  Renama
This commit is contained in:
unknown
2008-04-21 17:39:13 +02:00
parent 4638c78d35
commit 857a6dc14c
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1303,6 +1303,18 @@ sub remove_stale_vardir () {
mtr_error("No, don't remove the vardir when running with --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");
if ( $opt_vardir eq $default_vardir )
{
@ -1422,8 +1434,12 @@ sub setup_vardir() {
mkpath("$opt_vardir/log");
mkpath("$opt_vardir/run");
mkpath("$opt_vardir/tmp");
mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";
mkpath($opt_tmpdir);
if ($opt_tmpdir ne "$opt_vardir/tmp"){
mtr_report(" - symlinking 'var/tmp' to '$opt_tmpdir'");
symlink($opt_tmpdir, "$opt_vardir/tmp");
}
# copy all files from std_data into var/std_data
# and make them writable
@ -2701,7 +2717,7 @@ sub after_test_failure ($) {
}
}
# Remove all files in var/tmp
# Remove all files in the tmpdir
rmtree($opt_tmpdir);
mkpath($opt_tmpdir);