From: Frazer Clement
Date: April 14 2011 10:32am
Subject: bzr push into mysql-5.1-telco-6.3 branch (frazer.clement:3425 to 3426)
List-Archive: http://lists.mysql.com/commits/135425
Message-Id: <201104141032.p3EAWAkk029424@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3426 Frazer Clement	2011-04-13
      Add per Ndb custom data ptr mechanism

    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
 3425 jonas oreland	2011-04-09
      ndb - give up :-( ...add failing tests to disabled.ref/default.experimental

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2011-04-13 17:06:44 +0000
@@ -1717,6 +1717,10 @@ public:
   };
 
   Free_list_usage * get_free_list_usage(Free_list_usage*);
+
+  /* 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-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/Ndb.cpp	2011-04-13 17:06:44 +0000
@@ -2180,5 +2180,14 @@ Ndb::getNdbErrorDetail(const NdbError& e
   DBUG_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-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp	2011-04-13 17:06:44 +0000
@@ -111,6 +111,8 @@ public:
   }
 
   BaseString m_systemPrefix; // Buffer for preformatted for <sys>/<def>/
+  
+  void* customDataPtr;
 
   /**
    * NOTE free lists must be _after_ theNdbObjectIdMap take
@@ -350,5 +352,4 @@ Ndb_free_list_t<T>::release(Uint32 cnt,
   }
 #endif
 }
-
 #endif

=== modified file 'storage/ndb/src/ndbapi/Ndbinit.cpp'
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-04-13 17:06:44 +0000
@@ -208,7 +208,8 @@ NdbImpl::NdbImpl(Ndb_cluster_connection
     theNdbObjectIdMap(m_transporter_facade->theMutexPtr,
 		      1024,1024),
     theNoOfDBnodes(0),
-    m_ev_op(0)
+    m_ev_op(0),
+    customDataPtr(0)
 {
   int i;
   for (i = 0; i < MAX_NDB_NODES; i++) {

No bundle (reason: useless for push emails).