From: John David Duncan
Date: April 28 2011 11:58pm
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4170)
List-Archive: http://lists.mysql.com/commits/136344
Message-Id: <201104282358.p3SNwvVV010769@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1165364052=="

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

#At file:///Users/jdd/bzr-repo/cluster-7.2-labs-memcached/ based on revid:john.duncan@stripped

 4170 John David Duncan	2011-04-28
      Some shells do not allow "return -1"

    modified:
      storage/ndb/memcache/sandbox.sh.in
=== modified file 'storage/ndb/memcache/sandbox.sh.in'
--- a/storage/ndb/memcache/sandbox.sh.in	2011-04-18 20:08:02 +0000
+++ b/storage/ndb/memcache/sandbox.sh.in	2011-04-28 23:58:32 +0000
@@ -99,9 +99,9 @@ memcached_is_running() {
 }
 
 test_pid() {
-  test -f sandbox/$1  || return -1
+  test -f sandbox/$1  || return 1
   SERVERPID=`cat $HOME_BASE/sandbox/$1`
-  ps -p "$SERVERPID" > /dev/null || return -1
+  ps -p "$SERVERPID" > /dev/null || return 1
   return 0
 }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john.duncan@stripped
# target_branch: file:///Users/jdd/bzr-repo/cluster-7.2-labs-\
#   memcached/
# testament_sha1: 5c214767e00a784376872008d3aedc6c02deb4c7
# timestamp: 2011-04-28 16:58:47 -0700
# source_branch: file:///Users/jdd/bzr-repo/working/5.1-telco-7.2/
# base_revision_id: john.duncan@stripped\
#   pms53jx9djg5c3ix
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb619gsAAYffgAAQVGP/91Yw
WQC////0UAN5pSLeRLXEJIlTY1T01D1RvFNP0U8QUZo1BtEeo9AyQABU2qfgTUnonlAAAYCCSIEZ
RhU9T9SenpIA0eUNGnqHojQYAAAADQAAAAAJKJT1PSenpqJ+oniaNQMT9TIgGg0el/VYbvfaYjg1
srkFZzM4tB5MR/Hi/Pp0rh88mZlNd4bbpXtBjLVovClW+t2zu5/2VOrwff/hznfGA3TLXk+TZ4qf
8CtCpBzkvLvUlrTCwRrIHhVUHaSDNO53UdI+99iiyRcvILyF0vKnGaVhngoMAM3vcwin9TDsCwib
hci4jqXHgaCdXqXtN84R0qYnJkS4uoKMVvg36IIoEAPaOnKBBfGjXPcia/eeHeVhvyh9nXznogks
TNyhYc4CetI8NxJaIVdTQoyoJ4PSfHYg1yfYF9nwsnsLbq7xF176TrLdWfBZrZSdkQW93GQL0c2R
9HsogUJEUF7BodBqpVVXodgOtxMPEpKNEGrN2YUFaUNRsC0FL1WHlevVGJzC1wGMTp61zBTMGASk
xAbqdPGwk8YDiEDNIZHJzs8aB/QzGyA1zU+M4ddXezUFNyLpptEoE6N3GPx0v7dCDa/KnwmkTIsM
evGY6OXL+58qDfCFNcUbuEBg8Dmi53sPt456D03pF1GK18oX8NEIOBdMwRoRasovZ1288uxrhlZE
j0F9IW5d+1E5pXUOsMeYrBbiQcwaYTkup6YxIm80htQuBoxrvhFQXcPBTHTAJx980TYs48epIt2W
YOCvk/fDCVfbn06rG2PTpCrBrcO9+xsSXCnJrfZyms3H7TL6U9r55eFHQ06nYIKG7HVNVcSkW+us
coNvWcr9t7GgwXGehD6kxgPGzMkgC4jghSVGSyrBMlrKU0z7lnB39VmkgFAablJF66zEF59jG44F
k60EaQtNRwySCsHfWy05UpDa26o3PPCKn1GQjITZKcei6q2o1nOJkuNaMS7YKjpDEEhvZmChIGCL
2/hPBEWV7rZjp4fF6RckfxqA8pz4SPEKVa63fXDELJWSZjsCsPi4ya5/sB7BvxxBQzJNWEcoCPao
P5wNDddmtAVwpwOwhztySs7/Epkl27gKkeyBweRTH1aqT2hiJGhxc/riHgROSMQ3qbYs3/bCRQGV
zaMC1QFuIQFKjpU0yqUuJtPMV8/3FEjzLj5F3JFOFCQvrX2CwA==


--===============1165364052==--