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.(none):/data/msvensson/mysql/mysql-4.1-maint

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@pilot.(none)
2007-08-29 11:53:36 +02:00
parent b68689172f 387990f78d
commit 523cddeec3
2 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2172,7 +2172,7 @@ sub remove_stale_vardir () {
{
# Remove the directory which the link points at
mtr_verbose("Removing " . readlink($opt_vardir));
rmtree(readlink($opt_vardir));
mtr_rmtree(readlink($opt_vardir));
# Remove the "var" symlink
mtr_verbose("unlink($opt_vardir)");
@ -2200,7 +2200,7 @@ sub remove_stale_vardir () {
foreach my $bin ( glob("$opt_vardir/*") )
{
mtr_verbose("Removing bin $bin");
rmtree($bin);
mtr_rmtree($bin);
}
}
}
@ -2208,7 +2208,7 @@ sub remove_stale_vardir () {
{
# Remove the entire "var" dir
mtr_verbose("Removing $opt_vardir/");
rmtree("$opt_vardir/");
mtr_rmtree("$opt_vardir/");
}
if ( $opt_mem )
@ -2217,7 +2217,7 @@ sub remove_stale_vardir () {
# remove the $opt_mem dir to assure the symlink
# won't point at an old directory
mtr_verbose("Removing $opt_mem");
rmtree($opt_mem);
mtr_rmtree($opt_mem);
}
}
@ -2230,11 +2230,11 @@ sub remove_stale_vardir () {
# Remove the var/ dir in mysql-test dir if any
# this could be an old symlink that shouldn't be there
mtr_verbose("Removing $default_vardir");
rmtree($default_vardir);
mtr_rmtree($default_vardir);
# Remove the "var" dir
mtr_verbose("Removing $opt_vardir/");
rmtree("$opt_vardir/");
mtr_rmtree("$opt_vardir/");
}
}
@ -3192,7 +3192,7 @@ sub restore_slave_databases ($) {
{
my $data_dir= $slave->[$idx]->{'path_myddir'};
my $name= basename($data_dir);
rmtree($data_dir);
mtr_rmtree($data_dir);
mtr_copy_dir("$path_snapshot/$name", $data_dir);
}
}
@ -3485,7 +3485,7 @@ sub run_testcase ($) {
sub save_installed_db () {
mtr_report("Saving snapshot of installed databases");
rmtree($path_snapshot);
mtr_rmtree($path_snapshot);
foreach my $data_dir (@data_dir_lst)
{
@ -3532,7 +3532,7 @@ sub restore_installed_db ($) {
{
my $name= basename($data_dir);
save_files_before_restore($test_name, $data_dir);
rmtree("$data_dir");
mtr_rmtree("$data_dir");
mtr_copy_dir("$path_snapshot/$name", "$data_dir");
}
@ -3542,7 +3542,7 @@ sub restore_installed_db ($) {
{
foreach my $ndbd (@{$cluster->{'ndbds'}})
{
rmtree("$ndbd->{'path_fs'}" );
mtr_rmtree("$ndbd->{'path_fs'}" );
}
}
}