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

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged

1 files changed, 7 insertions, 14 deletions

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