From: John David Duncan
Date: April 18 2011 11:20pm
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4160)
List-Archive: http://lists.mysql.com/commits/135682
Message-Id: <201104182321.p3INL0MW018359@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0740653484=="

--===============0740653484==
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

 4160 John David Duncan	2011-04-18
      Add Ndb Custom Data ptr

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/src/ndbapi/Ndb.cpp
      storage/ndb/src/ndbapi/NdbImpl.hpp
      storage/ndb/src/ndbapi/Ndbinit.cpp
=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2011-02-09 14:59:39 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2011-04-18 23:20:12 +0000
@@ -1802,6 +1802,10 @@ public:
   
   Uint64 getClientStat(Uint32 id) const;
   const char* getClientStatName(Uint32 id) const;
+
+  /* Get/Set per-Ndb custom data pointer */
+  void setCustomData(void*);
+  void* getCustomData() const;
 #endif
 
 private:

=== modified file 'storage/ndb/src/ndbapi/Ndb.cpp'
--- a/storage/ndb/src/ndbapi/Ndb.cpp	2011-02-10 07:55:45 +0000
+++ b/storage/ndb/src/ndbapi/Ndb.cpp	2011-04-18 23:20:12 +0000
@@ -2242,3 +2242,15 @@ Ndb::getClientStatName(Uint32 id) const
 
   return NULL;
 }
+
+void
+Ndb::setCustomData(void* _customDataPtr)
+{
+  theImpl->customDataPtr = _customDataPtr;
+}
+
+void*
+Ndb::getCustomData() const
+{
+  return theImpl->customDataPtr;
+}

=== modified file 'storage/ndb/src/ndbapi/NdbImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbImpl.hpp	2011-02-09 14:59:39 +0000
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp	2011-04-18 23:20:12 +0000
@@ -125,6 +125,7 @@ public:
 
   BaseString m_systemPrefix; // Buffer for preformatted for <sys>/<def>/
 
+  void* customDataPtr;
   Uint64 clientStats[ Ndb::NumClientStatistics ];
   
   inline void incClientStat(const Ndb::ClientStatistics stat, const Uint64 inc) {
@@ -598,5 +599,4 @@ NdbImpl::sendFragmentedSignal(NdbApiSign
   }
   return -1;
 }
-
 #endif

=== modified file 'storage/ndb/src/ndbapi/Ndbinit.cpp'
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-02-04 17:52:38 +0000
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-04-18 23:20:12 +0000
@@ -192,7 +192,8 @@ NdbImpl::NdbImpl(Ndb_cluster_connection 
 		      1024,1024),
     theNoOfDBnodes(0),
     theWaiter(this),
-    m_ev_op(0)
+    m_ev_op(0),
+    customDataPtr(0)
 {
   int i;
   for (i = 0; i < MAX_NDB_NODES; i++) {


--===============0740653484==
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: 0856a9ea4b981b8188a0e3cc8bf2f426ed646bfd
# timestamp: 2011-04-18 16:20:55 -0700
# source_branch: file:///Users/jdd/bzr-repo/working/5.1-telco-7.2/
# base_revision_id: john.duncan@stripped\
#   axkg92mz44dxble3
# 
# Begin bundle
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


--===============0740653484==--