From: msvensson
Date: September 1 2007 9:41am
Subject: bk commit into 4.1 tree (msvensson:1.2683)
List-Archive: http://lists.mysql.com/commits/33559
Message-Id: <20070901094139.BFC7030E87B@pilot>

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-01 11:41:38+02:00, msvensson@pilot.(none) +1 -0
  Use eval around "rmtree" and use our own version of rmtree if it fails

  mysql-test/lib/mtr_misc.pl@stripped, 2007-09-01 11:41:37+02:00, msvensson@pilot.(none) +6 -13
    Use eval around "rmtree" and use our own version of rmtree if it fails

diff -Nrup a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
--- a/mysql-test/lib/mtr_misc.pl	2007-08-29 14:39:39 +02:00
+++ b/mysql-test/lib/mtr_misc.pl	2007-09-01 11:41:37 +02:00
@@ -206,22 +206,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
+  # 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 ) {
+  eval { rmtree($dir); };
+  if ( $@ ) {
     mtr_warning("rmtree($dir) failed, trying with File::Find...");
 
     my $errors= 0;