List:Commits« Previous MessageNext Message »
From:msvensson Date:April 23 2007 9:03am
Subject:bk commit into 5.0 tree (msvensson:1.2470)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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, 2007-04-23 11:03:40+02:00, msvensson@stripped +1 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2877.92

  mysql-test/lib/mtr_process.pl@stripped, 2007-04-23 11:03:39+02:00, msvensson@stripped +7 -7
    Auto merged
    MERGE: 1.15.1.19

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.55/mysql-test/lib/mtr_process.pl	2007-03-30 16:43:14 +02:00
+++ 1.56/mysql-test/lib/mtr_process.pl	2007-04-23 11:03:39 +02:00
@@ -1099,6 +1099,13 @@ sub mtr_kill_processes ($) {
 
   foreach my $pid (@$pids)
   {
+
+    if ($pid <= 0)
+    {
+      mtr_warning("Trying to kill illegal pid: $pid");
+      next;
+    }
+
     foreach my $sig (15, 9)
     {
       last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
Thread
bk commit into 5.0 tree (msvensson:1.2470)msvensson23 Apr