From: John David Duncan
Date: April 19 2011 6:48am
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4162)
List-Archive: http://lists.mysql.com/commits/135689
Message-Id: <201104190648.p3J6mjwl017595@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1722461286=="

--===============1722461286==
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-labs-memcached/ based on revid:john.duncan@stripped

 4162 John David Duncan	2011-04-18
      Duplicate connectstring before storing it.  This should fix bug resulting in a garbled connectstring and extra cluster connection.

    modified:
      storage/ndb/memcache/src/Configuration.cc
=== modified file 'storage/ndb/memcache/src/Configuration.cc'
--- a/storage/ndb/memcache/src/Configuration.cc	2011-04-09 07:36:24 +0000
+++ b/storage/ndb/memcache/src/Configuration.cc	2011-04-19 06:47:32 +0000
@@ -580,7 +580,7 @@ bool config_v1::get_connections() {
     if(str_is_null)
       connection_idx = conf.storeConnection(0, rtt);
     else 
-      connection_idx = conf.storeConnection(connectstring, rtt);
+      connection_idx = conf.storeConnection(strdup(connectstring), rtt);
        
     DEBUG_PRINT("[%d]:  { %d => \"%s\" [rtt: %d]}", connection_idx, 
                 cfg_data_id, str_is_null ? "" : connectstring, rtt);


--===============1722461286==
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-labs-\
#   memcached/
# testament_sha1: fdd833b576dcad724568df15016cc2001ee1f883
# timestamp: 2011-04-18 23:48:40 -0700
# base_revision_id: john.duncan@stripped\
#   x6n6ryyvnjxp8suj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbDT0ecAAXpfgBAQUGf//14Q
BAC///9wUAOc8DoDoAYhETCekzRohoPUwAJpiYmIQppqPU09NlIyephNBkGQNMhkYwAAAAA0GgDQ
DQET0UnpNGmyRp5Q00GgGjTQaAEkgI0RkaDSbTSnpkaJPJNNqeo2htyOFjOROeinyJGRFLMo4zN8
ijuRN3OABWc1WwLnnQBENfwVYDrKCqm2GsAdvq0ulhhBgqfcSExs0paL7CMEvnDDnduz/Vq+RHhm
KBuvWu2kturHYpSq6VQW9IZItwo+kYCohslUyZC6KDPchWJnpUbTiwQUIud8T3ilQTTXpx8V97EL
3+TTwrQpvhrIA+D6m6Ko51Yi09r8tcFsYWzW9zi3Mg8wlPU6oVjzahUqXnwio9uFOF7qwt4XjisV
w5WqVJuwFHSQXhLZrlNtWsZWV0sWg3wQPI6ttyrrFdMejEwlWvmcKoWK2BMxDjN+rYmIhMBWpJgt
ICqFhEQoNoEnmO0SbxATATJC33wSDLVwvesCImeqVOnCTisvnyV00h62rDROJQZwaCGlbrr5usHb
ovdNpCrcQcmk0CYSm3buaTrwKbMWM/fzgkSK2GP1J9Ds5nOlYzg794HWTw3XGvDeeQux9MZNztSK
i6u6AdV3166Ao6+fbQjgSaS/r46+O/r59Chnn5q8xNcLmhrUOgVyY7FvEcbN4LHmeq/foRjcMyRp
vmkM7z2O/LH+bRVtTq7w++/q+c13inOHrI1FbZeJHx2JHJ/W97Aqz2+1bvM756JtSj6UD16GAodY
Mbt05yc5GWGpyTYFBDobiQUAaAvnrCwC4hwGJTwJ0mhQo+LyeR/a8uZqLV8Zah+LiY8PRvoUNS0I
97FxDozcQsc/94govuV3gcerapaPpM0sjcJxgfkLaEGPXHCMb2Bk3bSFPtbLV48VzFaHsewzru4u
SxWRuFiHQVq4heF7vJMso86JDHlLRxlW0zmkZqydmFpwnGBB2ToCckN5JoJDGVoJ5INooocKnJPF
aiDJlyhp7r68EjWCmI5u+mGZEz6SPELGGXBy07cN//LdizJ56zqU621Cm8Xvu4ME6klyrUc4xHo0
UzcV/aZNmTOthCLLNcNFVs7FyspUDprv5VF5WH4r9Kl7KcsIddD3cC97nEaHaOzOhDmRTVCotqse
D6mUU63Ccl4K3N/+yBM7JaS1fArjAM1+KXZK5SDUvVfitPVKilWIu5IpwoSFhp6POA==


--===============1722461286==--