bk commit into 5.1 tree (msvensson:1.2556)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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, 2008-03-06 10:15:01+01:00, msvensson@stripped +1 -0
  Removed unused "#!remove_datadir"
  Cleanup BACKUP dir from clusters datadir in case of test failure

  mysql-test/mysql-test-run.pl@stripped, 2008-03-06 10:14:59+01:00, msvensson@stripped +8 -14
    Removed unused "#!remove_datadir"
    Cleanup BACKUP dir from clusters datadir in case of test failure

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-03-03 12:53:55 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-03-06 10:14:59 +01:00
@@ -2573,13 +2573,15 @@ sub after_test_failure ($) {
   {
     foreach my $ndbd ( ndbds($cluster) )
     {
-      my $datadir= $ndbd->value('DataDir');
-      foreach my $fs_dir ( glob("$datadir/ndb_*_fs") ) {
-	if (-d $fs_dir) {
-	  rmtree($fs_dir);
-	  mtr_debug("Removing '$fs_dir'");
-	}
+      my $data_dir= $ndbd->value('DataDir');
+      foreach my $fs_dir ( glob("$data_dir/ndb_*_fs") ) {
+	rmtree($fs_dir);
+	mtr_debug("Removing '$fs_dir'");
       }
+
+      my $backup_dir= $ndbd->value('BackupDataDir');
+      rmtree("$backup_dir/BACKUP");
+      mtr_debug("Removing '$backup_dir'");
     }
   }
 }
@@ -3009,14 +3011,6 @@ sub stop_servers($$) {
 
   foreach my $server (@servers)
   {
-    # Remove datadir
-    if ( $server->option('#!remove-datadir') )
-    {
-      my $datadir= $server->value('datadir');
-      mtr_debug("Removing '$datadir'");
-      rmtree($datadir);
-    }
-
     # Mark server as stopped
     $server->{proc}= undef;