bk commit into 5.1 tree (msvensson:1.2221)

[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-18 14:53:50+02:00, msvensson@neptunus.(none) +1 -0
  Add verbose printouts for im_start and im_stop

  mysql-test/mysql-test-run.pl@stripped, 2006-07-18 14:53:45+02:00, msvensson@neptunus.(none) +16 -17
    Add verbose printouts for im_start and im_stop

# 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.141/mysql-test/mysql-test-run.pl	2006-07-18 14:53:56 +02:00
+++ 1.142/mysql-test/mysql-test-run.pl	2006-07-18 14:53:56 +02:00
@@ -3417,8 +3417,9 @@
     return;
   }
 
-  $instance_manager->{'pid'} =
-    mtr_get_pid_from_file($instance_manager->{'path_pid'});
+  my $pid=  mtr_get_pid_from_file($instance_manager->{'path_pid'});
+  $instance_manager->{'pid'} = $pid;
+  mtr_verbose("im_start: pid: $pid");
 }
 
 
@@ -3460,25 +3461,23 @@
 
   # Try graceful shutdown.
 
-  mtr_debug("IM-main pid: $instance_manager->{'pid'}");
-  mtr_debug("Stopping IM-main...");
-
+  mtr_verbose("Stopping IM-main, pid: $instance_manager->{'pid'}");
   mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10);
 
   # If necessary, wait for angel process to die.
 
-  if (defined $instance_manager->{'angel_pid'})
+  my $pid= $instance_manager->{'angel_pid'};
+  if (defined $pid)
   {
-    mtr_debug("IM-angel pid: $instance_manager->{'angel_pid'}");
-    mtr_debug("Waiting for IM-angel to die...");
+    mtr_verbose("Waiting for IM-angel to die, pid: $pid");
 
     my $total_attempts= 10;
 
     for (my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt)
     {
-      unless (kill (0, $instance_manager->{'angel_pid'}))
+      unless (kill (0, $pid))
       {
-        mtr_debug("IM-angel died.");
+        mtr_verbose("IM-angel died.");
         last;
       }
 
@@ -3494,14 +3493,14 @@
   {
     if (kill (0, $instance_manager->{'pid'}))
     {
-      mtr_debug("IM-main is still alive.");
+      mtr_warning("IM-main is still alive.");
       last;
     }
 
     if (defined $instance_manager->{'angel_pid'} &&
         kill (0, $instance_manager->{'angel_pid'}))
     {
-      mtr_debug("IM-angel is still alive.");
+      mtr_warning("IM-angel is still alive.");
       last;
     }
 
@@ -3509,7 +3508,7 @@
     {
       if (kill (0, $pid))
       {
-        mtr_debug("Guarded mysqld ($pid) is still alive.");
+        mtr_warning("Guarded mysqld ($pid) is still alive.");
         last;
       }
     }
@@ -3525,18 +3524,18 @@
 
     if (defined $instance_manager->{'angel_pid'})
     {
-      mtr_debug("Killing IM-angel...");
+      mtr_verbose("Killing IM-angel, pid: $instance_manager->{'angel_pid'}");
       mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10)
     }
-    
-    mtr_debug("Killing IM-main...");
+
+    mtr_verbose("Killing IM-main, pid: $instance_manager->{'pid'}");
     mtr_kill_process($instance_manager->{'pid'}, 'KILL', 10);
 
     # Shutdown managed mysqld-processes. Some of them may be nonguarded, so IM
     # will not stop them on shutdown. So, we should firstly try to end them
     # legally.
 
-    mtr_debug("Killing guarded mysqld(s)...");
+    mtr_verbose("Killing guarded mysqld(s) " . join(@mysqld_pids));
     mtr_kill_processes(\@mysqld_pids);
 
     # Complain in error log so that a warning will be shown.