bk commit into 5.1 tree (msvensson:1.2233)

[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:56:29+02:00, msvensson@neptunus.(none) +1 -0
  Add printout of where error occured when printing to error log in 'im_stop'

  mysql-test/mysql-test-run.pl@stripped, 2006-07-26 10:56:27+02:00, msvensson@neptunus.(none)
+6 -5
    Add printout of where error occured when printing to error log in '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.145/mysql-test/mysql-test-run.pl	2006-07-26 10:56:35 +02:00
+++ 1.146/mysql-test/mysql-test-run.pl	2006-07-26 10:56:35 +02:00
@@ -367,7 +367,7 @@ sub mysqld_start ($$$);
 sub mysqld_arguments ($$$$$);
 sub stop_all_servers ();
 sub im_start ($$);
-sub im_stop ($);
+sub im_stop ($$);
 sub run_mysqltest ($);
 sub usage ($);
 
@@ -2364,7 +2364,7 @@ sub run_testcase ($) {
   if ( ! $glob_use_running_server and $tinfo->{'component_id'} eq 'im' and
        $instance_manager->{'pid'} )
   {
-    im_stop($instance_manager);
+    im_stop($instance_manager, $tinfo->{'name'});
   }
 }
 
@@ -2904,7 +2904,7 @@ sub stop_all_servers () {
   if ( $instance_manager->{'pid'} )
   {
     print  "Shutting-down Instance Manager\n";
-    im_stop($instance_manager);
+    im_stop($instance_manager, "stop_all_servers");
   }
 
   my %admin_pids; # hash of admin processes that requests shutdown
@@ -3423,8 +3423,9 @@ sub im_start($$) {
 }
 
 
-sub im_stop($) {
+sub im_stop($$) {
   my $instance_manager = shift;
+  my $where = shift;
 
   # Obtain mysqld-process pids before we start stopping IM (it can delete pid
   # files).
@@ -3539,7 +3540,7 @@ sub im_stop($) {
 
     my $ts= localtime();
     print ERRLOG
-      "Warning: [$ts] Instance Manager did not shutdown gracefully.\n";
+      "[$where] Warning: [$ts] Instance Manager did not shutdown gracefully.\n";
 
     close ERRLOG;
   }