bk commit into 5.1 tree (msvensson:1.2590)

[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-05-09 17:10:08+02:00, msvensson@pilot.(none) +1 -0
  Reenable the removal of ndbcluster specific files after server restart

  mysql-test/mysql-test-run.pl@stripped, 2008-05-09 17:10:06+02:00, msvensson@pilot.(none)
+24 -0
    Reenable the removal of ndbcluster specific files after server restart

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-05-09 11:42:16 +02:00
+++ b/mysql-test/mysql-test-run.pl	2008-05-09 17:10:06 +02:00
@@ -332,6 +332,7 @@ sub setup_vardir ();
 sub check_ssl_support ($);
 sub check_running_as_root();
 sub check_ndbcluster_support ($);
+sub rm_ndbcluster_tables ($);
 sub ndbcluster_start_install ($);
 sub ndbcluster_start ($$);
 sub ndbcluster_wait_started ($$);
@@ -2834,6 +2835,16 @@ sub ndbcluster_start ($$) {
 }
 
 
+sub rm_ndbcluster_tables ($) {
+  my $dir=       shift;
+  foreach my $bin ( glob("$dir/mysql/ndb_apply_status*"),
+                    glob("$dir/mysql/ndb_schema*"))
+  {
+    unlink($bin);
+  }
+}
+
+
 ##############################################################################
 #
 #  Run the benchmark suite
@@ -4267,6 +4278,11 @@ sub stop_all_servers () {
   # Make sure that process has shutdown else try to kill them
   mtr_check_stop_servers(\@kill_pids);
 
+  foreach my $mysqld (@{$master}, @{$slave})
+  {
+    rm_ndbcluster_tables($mysqld->{'path_myddir'});
+  }
+
 }
 
 
@@ -4536,6 +4552,14 @@ sub run_testcase_stop_servers($$$) {
   # Make sure that process has shutdown else try to kill them
   mtr_check_stop_servers(\@kill_pids);
 
+  foreach my $mysqld (@{$master}, @{$slave})
+  {
+    if ( ! $mysqld->{'pid'} )
+    {
+      # Remove ndbcluster tables if server is stopped
+      rm_ndbcluster_tables($mysqld->{'path_myddir'});
+    }
+  }
 }