bk commit into 5.1 tree (joerg:1.2299)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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
  1.2299 06/04/07 13:58:45 joerg@stripped +3 -0
  Null-merge, as the changes in question were backports from 5.1.

  mysql-test/mysql-test-run.sh
    1.312 06/04/07 13:58:39 joerg@stripped +0 -10
    Null-merge, as the changes in question were backports from 5.1.

  mysql-test/mysql-test-run.pl
    1.101 06/04/07 13:58:39 joerg@stripped +0 -9
    Null-merge, as the changes in question were backports from 5.1.

  mysql-test/lib/mtr_process.pl
    1.29 06/04/07 13:51:34 joerg@stripped +0 -0
    Auto merged

# 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:	joerg
# Host:	trift2.
# Root:	/M51/merge-5.1/RESYNC

--- 1.28/mysql-test/lib/mtr_process.pl	2006-03-06 11:33:42 +01:00
+++ 1.29/mysql-test/lib/mtr_process.pl	2006-04-07 13:51:34 +02:00
@@ -465,8 +465,7 @@
 
         if ( kill(0, @pids) )           # Check if some left
         {
-          # FIXME maybe just mtr_warning() ?
-          mtr_error("can't kill process(es) " . join(" ", @pids));
+          mtr_warning("can't kill process(es) " . join(" ", @pids));
         }
       }
     }
@@ -479,7 +478,7 @@
   {
     if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) )
     {
-      mtr_error("can't kill old mysqld holding port $srv->{'port'}");
+      mtr_warning("can't kill old mysqld holding port $srv->{'port'}");
     }
   }
 }