1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
This commit is contained in:
unknown 2007-09-01 11:41:59 +02:00
commit 5ece0c9b44
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/lib/mtr_misc.pl
View File

@ -204,22 +204,15 @@ sub mtr_copy_dir($$) {
sub mtr_rmtree($) { sub mtr_rmtree($) {
my ($dir)= @_; my ($dir)= @_;
my $need_file_find= 0;
mtr_verbose("mtr_rmtree: $dir"); mtr_verbose("mtr_rmtree: $dir");
{ # Try to use File::Path::rmtree. Recent versions
# Try to use File::Path::rmtree. Recent versions # handles removal of directories and files that don't
# handles removal of directories and files that don't # have full permissions, while older versions
# have full permissions, while older versions # may have a problem with that and we use our own version
# may have a problem with that and we use our own version
local $SIG{__WARN__}= sub { eval { rmtree($dir); };
$need_file_find= 1; if ( $@ ) {
mtr_warning($_[0]);
};
rmtree($dir);
}
if ( $need_file_find ) {
mtr_warning("rmtree($dir) failed, trying with File::Find..."); mtr_warning("rmtree($dir) failed, trying with File::Find...");
my $errors= 0; my $errors= 0;