bzr commit into mysql-5.1-telco-7.0 branch (msvensson:2957)

[Magnus Svensson]

#At file:///home/msvensson/mysql/bug/43641/ based on revid:msvensson@stripped

 2957 Magnus Svensson	2009-03-26
      ndb  - use "ndb_mgm_node_type" type in ConfigRetriever

    modified:
      storage/ndb/include/mgmcommon/ConfigRetriever.hpp
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
=== modified file 'storage/ndb/include/mgmcommon/ConfigRetriever.hpp'
--- a/storage/ndb/include/mgmcommon/ConfigRetriever.hpp	2009-03-04 10:07:03 +0000
+++ b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp	2009-03-26 08:33:33 +0000
@@ -27,7 +27,7 @@
 class ConfigRetriever {
 public:
   ConfigRetriever(const char * _connect_string,
-		  Uint32 version, Uint32 nodeType,
+                  Uint32 version, ndb_mgm_node_type nodeType,
 		  const char * _bind_address = 0,
                   int timeout_ms = 30000);
   ~ConfigRetriever();
@@ -96,7 +96,7 @@ private:
 
   bool m_end_session;
   Uint32 m_version;
-  Uint32 m_node_type;
+  ndb_mgm_node_type m_node_type;
   NdbMgmHandle m_handle;
 };
 

=== modified file 'storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp'
--- a/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2009-03-05 06:42:20 +0000
+++ b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2009-03-26 08:33:33 +0000
@@ -30,7 +30,8 @@
 //****************************************************************************
 
 ConfigRetriever::ConfigRetriever(const char * _connect_string,
-				 Uint32 version, Uint32 node_type,
+				 Uint32 version,
+                                 ndb_mgm_node_type node_type,
 				 const char * _bindaddress,
                                  int timeout_ms) :
   m_end_session(true),

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2009-03-04 10:40:00 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2009-03-26 08:33:33 +0000
@@ -123,8 +123,8 @@ Configuration::fetch_configuration(const
 
   m_mgmd_port= 0;
   m_config_retriever= new ConfigRetriever(_connect_string,
-					  NDB_VERSION, 
-					  NODE_TYPE_DB,
+                                          NDB_VERSION,
+                                          NDB_MGM_NODE_TYPE_NDB,
 					  _bind_address);
 
   if (m_config_retriever->hasError())

=== modified file 'storage/ndb/src/ndbapi/ndb_cluster_connection.cpp'
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2009-03-14 20:42:04 +0000
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2009-03-26 08:33:33 +0000
@@ -353,7 +353,7 @@ Ndb_cluster_connection_impl(const char *
     ndb_print_state_mutex= NdbMutex_Create();
 #endif
   m_config_retriever=
-    new ConfigRetriever(connect_string, NDB_VERSION, NODE_TYPE_API);
+    new ConfigRetriever(connect_string, NDB_VERSION, NDB_MGM_NODE_TYPE_API);
   if (m_config_retriever->hasError())
   {
     m_latest_error= 1;


Attachment: [text/bzr-bundle] bzr/[e-mail]