bk commit into 5.1 tree (msvensson:1.2232)

[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 10:35:08+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem with detecting wheter im processes has shutdown cleanly

  mysql-test/mysql-test-run.pl@stripped, 2006-07-26 10:35:06+02:00, msvensson@neptunus.(none) +17 -24
    Fix problem with checking that all im processes has shutdown cleanly
    When it was detected that one of "im mysqlds" didn't shutdown, last was called to break the loop, but it only broke the inner loop.
    Remove the while(0) loop and make this easier by setting $clean_shutdown to 0 if any such problem is detected.

# 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.144/mysql-test/mysql-test-run.pl	2006-07-26 10:35:14 +02:00
+++ 1.145/mysql-test/mysql-test-run.pl	2006-07-26 10:35:14 +02:00
@@ -3485,36 +3485,29 @@ sub im_stop($) {
     }
   }
 
-  # Check that all processes died.
+  # Check if all processes shutdown cleanly
+  my $clean_shutdown= 1; # Assum they did
 
-  my $clean_shutdown= 0;
-
-  while (1)
+  if (kill (0, $instance_manager->{'pid'}))
   {
-    if (kill (0, $instance_manager->{'pid'}))
-    {
-      mtr_warning("IM-main is still alive.");
-      last;
-    }
+    mtr_warning("IM-main is still alive.");
+    $clean_shutdown= 0;
+  }
 
-    if (defined $instance_manager->{'angel_pid'} &&
-        kill (0, $instance_manager->{'angel_pid'}))
-    {
-      mtr_warning("IM-angel is still alive.");
-      last;
-    }
+  if (defined $instance_manager->{'angel_pid'} &&
+      kill (0, $instance_manager->{'angel_pid'}))
+  {
+    mtr_warning("IM-angel is still alive.");
+    $clean_shutdown= 0;
+  }
 
-    foreach my $pid (@mysqld_pids)
+  foreach my $pid (@mysqld_pids)
+  {
+    if (kill (0, $pid))
     {
-      if (kill (0, $pid))
-      {
-        mtr_warning("Guarded mysqld ($pid) is still alive.");
-        last;
-      }
+      mtr_warning("Guarded mysqld ($pid) is still alive.");
+      $clean_shutdown= 0;
     }
-
-    $clean_shutdown= 1;
-    last;
   }
 
   # Kill leftovers (the order is important).