From: John David Duncan
Date: April 18 2011 8:08pm
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4159)
List-Archive: http://lists.mysql.com/commits/135667
Message-Id: <201104182009.p3IK913Z027646@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1265816089=="

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

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

 4159 John David Duncan	2011-04-18
      sandbox script: ability to stop memcached only and start memcached with options

    modified:
      storage/ndb/memcache/sandbox.sh.in
=== modified file 'storage/ndb/memcache/sandbox.sh.in'
--- a/storage/ndb/memcache/sandbox.sh.in	2011-04-09 07:36:24 +0000
+++ b/storage/ndb/memcache/sandbox.sh.in	2011-04-18 20:08:02 +0000
@@ -113,7 +113,7 @@ load_metadata() {
 start_memcached() {
   $MEMCACHE_BASE/bin/memcached -d -v \
     -P $HOME_BASE/sandbox/memcached.pid \
-    -E $MEMCACHE_BASE/lib/ndb_engine.so
+    -E $MEMCACHE_BASE/lib/ndb_engine.so $1 $2
 }
 
 stop_memcached() {
@@ -142,6 +142,8 @@ final_message() {
 
 if test "$1" = "stop" 
  then 
+   test "$2" = "memcached"  &&   stop_memcached   &&  exit
+
    mysqld_is_running        &&   stop_mysqld
    memcached_is_running     &&   stop_memcached
    mgm_server_is_running    &&   stop_mgm_server
@@ -159,7 +161,7 @@ if test "$1" = "stop" 
   
   test -d sandbox/data/ndbmemcache    ||  load_metadata
   
-  memcached_is_running                ||  start_memcached  
+  memcached_is_running                ||  start_memcached
 
   final_message
 fi


--===============1265816089==
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/working/cluster-7.2-bernd/
# testament_sha1: c56215031372f79f156d1a50ae6059fa55eb57f7
# timestamp: 2011-04-18 13:08:51 -0700
# base_revision_id: john.duncan@stripped\
#   gqvoavhzj51199yp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdhi0vYAAZvfgEAUVWP/935S
CAC////0UAO5XuxLuN3dXSWEopko80U2IxNBlPUPSGjQDaTTyjIJSIyMamgiPFDQABoAAaAZJo0I
nkTEyp+kmZE2kB6QA9Q0aHMABMAATAAAAAASSIyEwInqYwmqNlMR5RhDIDQvTDftb2r9ssk3ehZI
VwssBHRl11hN0FhcS7xu3LlBV81GPDHDlAOnz7ERAPx9ALHsgwTRMVyi6DPaViYd3+r8/usOMvRC
2/Bicmv0qNIWkk80qzW5nVIxUeUUiXUKjsDjTsCgjXHvreTcBHO0Z5NHtoSJEhjoVvfJevpmwA0G
dSCH5nSwUslxMOBc7vxJMKgkFFBEnbKtzDm65h2MRpq6OR6CfRHPVJBIpWDn0z0zlbToTyJHLGIa
61Ax5aQBXjHWIOzDOMgyxBncTjmQdBmMaWAJGMdtJX1vAzGug1BQicO7GCI/DfsA8JQiJrWmNhDA
CBdk94LxelD5gyWLg0A8YkWhxruEQdt1Wm7+AZLdDaUqxgq4Oay0k14MlcxVTWOyyeRYCrZfXKSV
2UaLYF1agX4vpRKo2uV0rCFA8WEhNYk6skU03a8KAXCtQ2K3gcsm2uSaYNusSIL3CDijIHiIDRTc
TDssN1IxcvxtfRC+npiVFMfDD7kOvGB/CKuHxc9rkodOoO58vozzN4TBi878y/ilR8UimWSmQNvO
2yAKWiIctSIGa8w/VItKuJ33dvXuMuju4wIvMR9WxeIpQn59onWasi9J2QKm0/sZOqsBmSKPBIbG
Y2EGIsTVbiGYvKOLaBahAMxY6nDrE/TeSJg896EiaeMxPApEaZmd8+POjA4WwqCboNFYG/245Wsq
wyswZL3aXom7YckVJ4qHq65a3PrAHexGWV6/pxqMkRjojqU7B7eJdSh/cF2F6ZgtHTsLWC+puCtG
E5t4tVCrFNC860zsKNiUhdJHjoobnB00swbedlEC2hkIw3l4r0lRZmVCsD0NDpwC0LXcmXGhIbgJ
rWq30Tx2ZHYkYLYTPPAcA5NKjWcXjmDBfg4wcSECkhI3gFRADBwVPgxVvtyJZ2lRBky7N2mgaunt
wSN4KcPfsdGcZ/skPClaOVmgNg0cGZPPcEkI9UKZeQaGG0JEjRSI9tQ3HKRWr6zD4PQ9WYjdvpx7
Era/kUHCkwEsPg0TIZoJkS2X9V+CuXvECiUme+cspWi2MwbTojIZlt+Xk9IhNXMq0aw/wVby4KBS
wEymo1sY0HwPkFokOYaDv7n/i7kinChIbDFpewA=


--===============1265816089==--