Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.1

1 files changed, 0 insertions, 83 deletions

diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp
index 1c9c2db5d6b..766409d64e2 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/ndb/include/ndbapi/Ndb.hpp
@@ -901,23 +901,6 @@ typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);
                                       NDB_MAX_SCHEMA_NAME_SIZE + \
                                       NDB_MAX_TAB_NAME_SIZE*2
 
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-class NdbWaiter {
-public:
-  NdbWaiter();
-  ~NdbWaiter();
-
-  void wait(int waitTime);
-  void nodeFail(Uint32 node);
-  void signal(Uint32 state);
-
-  Uint32 m_node;
-  Uint32 m_state;
-  void * m_mutex;
-  struct NdbCondition * m_condition;  
-};
-#endif
-
 /**
  * @class Ndb 
  * @brief Represents the NDB kernel and is the main class of the NDB API.
@@ -1199,39 +1182,6 @@ public:
 				  const char *  keyData = 0, 
 				  Uint32        keyLen = 0);
 
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-  /**
-   * This method is a modification of Ndb::startTransaction, 
-   * in which we use only the first two chars of keyData to 
-   * select transaction coordinator.
-   * This is referred to as a distribution group. 
-   * There are two ways to use the method: 
-   * - In the first, the two characters are used directly as 
-   *   the distribution key, and 
-   * - in the second the distribution is calculated as:
-   *   (10 * (char[0] - 0x30) + (char[1] - 0x30)). 
-   *   Thus, in the second way, the two ASCII digits '78' 
-   *   will provide the distribution key = 78.
-   *
-   * @note Transaction priorities are not yet supported.
-   *
-   * @param aPrio   Priority of the transaction.<br>
-   * 	Priority 0 is the highest priority and is used for short transactions 
-   *      with requirements on low delay.<br>
-   * 	Priority 1 is a medium priority for short transactions.<br>
-   * 	Priority 2 is a medium priority for long transactions.<br>
-   * 	Priority 3 is a low priority for long transactions.
-   * @param keyData is a string of which the two first characters 
-   *        is used to compute which fragement the data is stored in.
-   * @param type is the type of distribution group.<br> 
-   *        0 means direct usage of the two characters, and<br>
-   *        1 means the ASCII digit variant.
-   * @return NdbConnection, or NULL if it failed.
-   */
-  NdbConnection* startTransactionDGroup(Uint32 aPrio, 
-					const char * keyData, int type);
-#endif
-
   /**
    * When a transactions is completed, the transaction has to be closed.
    *
@@ -1586,8 +1536,6 @@ private:
 /******************************************************************************
  *	These are the private variables in this class.	
  *****************************************************************************/
-  Ndb_cluster_connection   *m_ndb_cluster_connection;
-
   NdbConnection**       thePreparedTransactionsArray;
   NdbConnection**       theSentTransactionsArray;
   NdbConnection**       theCompletedTransactionsArray;
@@ -1601,8 +1549,6 @@ private:
 
   Uint32                theNextConnectNode;
 
-  NdbWaiter             theWaiter;
-  
   bool fullyQualifiedNames;
 
   // Ndb database name.
@@ -1658,35 +1604,6 @@ private:
     InitConfigError
   } theInitState;
 
-  /**
-   * Computes fragement id for primary key
-   *
-   * Note that keydata has to be "shaped" as it is being sent in KEYINFO
-   */
-  Uint32 computeFragmentId(const char * keyData, Uint32 keyLen);
-  Uint32 getFragmentId(Uint32 hashValue);
-  
-  /**
-   * Make a guess to which node is the primary for the fragment
-   */
-  Uint32 guessPrimaryNode(Uint32 fragmentId);
-  
-  /**
-   * Structure containing values for guessing primary node
-   */
-  struct StartTransactionNodeSelectionData {
-    StartTransactionNodeSelectionData():
-      fragment2PrimaryNodeMap(0) {};
-    Uint32 kValue;
-    Uint32 hashValueMask;
-    Uint32 hashpointerValue;
-    Uint32 noOfFragments;
-    Uint32 * fragment2PrimaryNodeMap;
-    
-    void init(Uint32 noOfNodes, Uint8 nodeIds[]);
-    void release();
-  } startTransactionNodeSelectionData;
-  
   NdbApiSignal* theCommitAckSignal;