merge

ndb/include/mgmapi/mgmapi.h

@@ -491,6 +491,7 @@ extern "C" {
    */
   const char * ndb_mgm_get_node_status_string(enum ndb_mgm_node_status status);
 
+  const char * ndb_mgm_get_clusterlog_level_string(enum ndb_mgm_clusterlog_level);
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   ndb_mgm_event_category ndb_mgm_match_event_category(const char *);
   const char * ndb_mgm_get_event_category_string(enum ndb_mgm_event_category);

ndb/include/ndbapi/NdbDictionary.hpp

@@ -1107,13 +1107,6 @@ public:
      */
     int alterTable(const Table &);
 
-    /**
-     * Get table with given name, NULL if undefined
-     * @param name   Name of table to get
-     * @return table if successful otherwise NULL.
-     */
-    const Table * getTable(const char * name);
-
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
     /**
      * Invalidate cached table object

ndb/src/ndbapi/Ndb.cpp

@@ -78,7 +78,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
 //****************************************************************************
 // We have connections now to the desired node. Return
 //****************************************************************************
-	return getConnectedNdbConnection(tNode);
+	return getConnectedNdbTransaction(tNode);
       } else if (TretCode != 0) {
 	tAnyAlive= 1;
       }//if
@@ -103,7 +103,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
 //****************************************************************************
 // We have connections now to the desired node. Return
 //****************************************************************************
-	return getConnectedNdbConnection(tNode);
+	return getConnectedNdbTransaction(tNode);
       } else if (TretCode != 0) {
 	tAnyAlive= 1;
       }//if

ndb/src/ndbapi/NdbImpl.hpp

@@ -89,9 +89,9 @@ Ndb::void2rec(void* val){
 }
 
 inline
-NdbConnection *
+NdbTransaction *
 Ndb::void2con(void* val){
-  return (NdbConnection*)val;
+  return (NdbTransaction*)val;
 }
 
 inline
@@ -107,7 +107,7 @@ Ndb::void2rec_iop(void* val){
 }
 
 inline 
-NdbConnection * 
+NdbTransaction * 
 NdbReceiver::getTransaction(){ 
   return ((NdbOperation*)m_owner)->theNdbCon;
 }

ndb/src/ndbapi/Ndbif.cpp

@@ -19,6 +19,7 @@
 
 #include "NdbApiSignal.hpp"
 #include "NdbImpl.hpp"
+#include <NdbTransaction.hpp>
 #include <NdbOperation.hpp>
 #include <NdbIndexOperation.hpp>
 #include <NdbScanOperation.hpp>

ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -29,6 +29,7 @@
 #include <ConfigRetriever.hpp>
 #include <ndb_version.h>
 #include <mgmapi_debug.h>
+#include <md5_hash.hpp>
 
 static int g_run_connect_thread= 0;
 
@@ -255,8 +256,6 @@ Ndb_cluster_connection_impl::Ndb_cluster_connection_impl(const char *
 {
   DBUG_ENTER("Ndb_cluster_connection");
   DBUG_PRINT("enter",("Ndb_cluster_connection this=0x%x", this));
-  m_transporter_facade=
-    TransporterFacade::theFacadeInstance= new TransporterFacade();
 
   m_connect_thread= 0;
   m_connect_callback= 0;
@@ -281,6 +280,10 @@ Ndb_cluster_connection_impl::Ndb_cluster_connection_impl(const char *
     m_config_retriever= 0;
   }
 
+  m_transporter_facade=
+    TransporterFacade::theFacadeInstance= 
+    new TransporterFacade(m_config_retriever->get_mgmHandle());
+  
   DBUG_VOID_RETURN;
 }
 
@@ -490,7 +493,7 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
     m_impl.init_nodes_vector(nodeId, *props);
 
     for(int i=0;i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();i++)
-      ndb_mgm_set_connection_int_parameter(m_config_retriever->get_mgmHandle(),
+      ndb_mgm_set_connection_int_parameter(m_impl.m_config_retriever->get_mgmHandle(),
 					   nodeId,
 					   m_impl.m_transporter_facade->get_registry()
 					     ->m_transporter_interface[i]