From: Bjorn Munch
Date: April 20 2011 12:59pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2999) Bug#12379923
List-Archive: http://lists.mysql.com/commits/135808
X-Bug: 12379923
Message-Id: <201104201259.p3KCxxLk022261@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0751629737=="

--===============0751629737==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/kill-51/ based on revid:bjorn.munch@stripped

 2999 Bjorn Munch	2011-04-20
      Bug #12379923 60907: MYSQL-TEST/LIB/MY/SAFEPROCESS/SAFE_PROCESS.PL USES HARDCODED SIGNAL NUMBE
      Replaced the hardcoded 9 with 'KILL'

    modified:
      mysql-test/lib/My/SafeProcess/safe_process.pl
=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.pl'
--- a/mysql-test/lib/My/SafeProcess/safe_process.pl	2007-12-20 17:39:33 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process.pl	2011-04-20 12:58:53 +0000
@@ -94,7 +94,7 @@ eval {
   local $SIG{INT}=  \&handle_signal;
   local $SIG{CHLD}= sub {
     message("Got signal @_");
-    kill(9, -$child_pid);
+    kill('KILL', -$child_pid);
     my $ret= waitpid($child_pid, 0);
     if ($? & 127){
       exit(65); # Killed by signal
@@ -134,7 +134,7 @@ if ( $@ ) {
 # Use negative pid in order to kill the whole
 # process group
 #
-my $ret= kill(9, -$child_pid);
+my $ret= kill('KILL', -$child_pid);
 message("Killed child: $child_pid, ret: $ret");
 if ($ret > 0) {
   message("Killed child: $child_pid");


--===============0751629737==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/kill-51/
# testament_sha1: 29f0a729b402631da0f4871bbbe47433aaa10622
# timestamp: 2011-04-20 14:59:59 +0200
# base_revision_id: bjorn.munch@stripped\
#   ih4jc1eloben5av2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaT4NVQAAY/fgEAQXOf//3/v
/iC////wUAPDu6RcFe23dW2EoiBNM1Mp6E8mkYjJqZDTaJ+oTZCfqZMkNBkiYhiMUxBoiDaGoAyA
ZAyA00EkjQRMU2in5I01PSMjQGgADQ0AAGSp6geoyGgAB6gAAAAAAASiFR7UymR6anqZppo1MjCa
MI0NGmgAGhlFdQtt9KcGBMM7OaVAnxS0vNbcbDVMjfL/bIKjD+pVFU9vQOD0K5k45vN55X3mSeGe
7q+y+ltDJeqjeqDa66NpOzNcGKJj6RbyL0kQyG6ZRo8bhCNkWYwY86cL8lcYm4pvtxuqBDYIbaLn
HLzW+aXBnLJYjCpAQiAqSQ8UQEdhjh2xhlv4VVReD6FawclskGZXmsQdbgHk9vMSGPE6Ul0nFVRv
EEtPaV/qMRIoI9GB46pBoe+t1rP4C0YJwMlKes51oZBEV3ETNgxBpNRkuKRPTSQO8P2rNg8IE8BN
CcLjRFo40dU2yT3SLW2Wlpebr7CR3qpYGClA0CL/Y2ZtoAjxFo1DeZPDMnwO141XAwqNea9CsgcT
Cb71xyywvpSp1grnM7oTmOQFwqEDc943TCsFDB1ia5SK2BrA/RagQqJw3zQSvBg6Nlwscy5AkVnf
PEzrJjFlnyWF5MvSldXOGiMIhhSVGehAnBNNnhkIQQr2En4KSWLFQ1TL39WQQg6C309YyVRS2zOe
x+W+7ckT9stp2ttHVWQ7U8Eg3Pp74rib2Rm9aC91cMMznFTzxdJLut9H7OR/GP8uetBbM41NnPsg
GBp1OGfNh3eWsQkkQYH8PGdz3n5TRodia0f63hLDu7e/X4zSm1IE0EQrPiYqG6UMKSbKHHq6a8FI
JP8D7FEObrRC9iORIDL5toyXDnH7ZprZwKxNBcpdYZmrHeP2ayrxskX/fAUOxjE4zq6sjI7oiXoZ
LKDyOivkmVjqXTq2nA7iV/ewgTEmmsVFTmLJK9mxcoKJQn3Fi2iKDUbvkRJwjC6DCEwTZZlL5gei
/SWJkjUFIj0kRP7aEjb0C18zYZnR6k1dpBUJz6mg403JHcL7Qm304W8YZg5eVs1RmTSfOrQIZKVY
cW3gnDinrDBaaQjBrAdGm8IKPvlxqWLz0bFD0IhePhsk4a27MQ1oy9II9AL5UqZBj0BCQkVHVSKA
hwDtWhQUWTKfLqVoZMwKS2N3XM/8I7QWLhSNsU+V8ALxTSiGgLBm7IXZGyOSmG10BsQaeDiwE58w
YLy2btZW6xQZIwDJ4O4XhLz5FHnaOz7gaiypXqWDIZCJCuo5CaG6UksEbhHudV5RVfRKLIyCHjrF
QFoC0PmrgDtGPL4vbgCH3HHyLiXgIpoM4KWK8HGtkk3cExPnMSlg4v+LuSKcKEhSfBqqAA==


--===============0751629737==--