bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4306 to 4307)

[Frazer Clement]

 4307 Frazer Clement	2011-04-13 [merge]
      Merge 6.3->7.0

    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
 4306 Jonas Oreland	2011-04-13
      ndb - increase MAX_SUMA_MESSAGE_IN_WORDS somewhat for easier testing!
        and fix a few Hugo "max-tables" constants

    modified:
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      storage/ndb/test/include/NDBT_Tables.hpp
      storage/ndb/test/src/NDBT_Tables.cpp
=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2011-02-09 14:18:53 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2011-04-13 19:33:59 +0000
@@ -1757,6 +1757,10 @@ public:
   /* Get minimum known DB node version */
   Uint32 getMinDbNodeVersion() const;
 
+  /* Get/Set per-Ndb custom data pointer */
+  void setCustomData(void*);
+  void* getCustomData() const;
+  
   /* Some client behaviour counters to assist
    * optimisation
    */

=== 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-13 19:33:59 +0000
@@ -2194,6 +2194,17 @@ Ndb::getNdbErrorDetail(const NdbError& e
   DBUG_RETURN(NULL);
 }
 
+void
+Ndb::setCustomData(void* _customDataPtr)
+{
+  theImpl->customDataPtr = _customDataPtr;
+}
+
+void*
+Ndb::getCustomData() const
+{
+  return theImpl->customDataPtr;
+}
 
 Uint32
 Ndb::getMinDbNodeVersion() const

=== modified file 'storage/ndb/src/ndbapi/NdbImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbImpl.hpp	2011-04-06 14:16:13 +0000
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp	2011-04-13 19:33:59 +0000
@@ -124,6 +124,8 @@ public:
   }
 
   BaseString m_systemPrefix; // Buffer for preformatted for <sys>/<def>/
+  
+  void* customDataPtr;
 
   Uint64 clientStats[ Ndb::NumClientStatistics ];
   

=== 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-13 19:33:59 +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++) {

No bundle (reason: useless for push emails).