bk commit into 5.1 tree (msvensson:1.2231)

[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, 2006-07-26 09:53:48+02:00, msvensson@neptunus.(none) +1 -0
  Add the instance manager to the list of processes to shutdown and ping in
mtr_kill_leftovers

  mysql-test/lib/mtr_process.pl@stripped, 2006-07-26 09:53:46+02:00, msvensson@neptunus.(none)
+3 -1
    Add the instance manager to the list of processes to shutdown and ping in
mtr_kill_leftovers

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.43/mysql-test/lib/mtr_process.pl	2006-07-26 09:53:54 +02:00
+++ 1.44/mysql-test/lib/mtr_process.pl	2006-07-26 09:53:54 +02:00
@@ -340,7 +340,9 @@ sub mtr_kill_leftovers () {
   my $pid;
 
   #Start shutdown of instance_managers, masters and slaves
-  foreach my $srv (@{$::instance_manager->{'instances'}},@{$::master},@{$::slave})
+  foreach my $srv ($::instance_manager,
+		   @{$::instance_manager->{'instances'}},
+		   @{$::master},@{$::slave})
   {
     $pid= mtr_mysqladmin_start($srv, "shutdown", 70);