Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

7 files changed, 81 insertions, 48 deletions

diff --git a/ndb/include/mgmapi/mgmapi.h b/ndb/include/mgmapi/mgmapi.h
index 726552d63d1..dca88e4950e 100644
--- a/ndb/include/mgmapi/mgmapi.h
+++ b/ndb/include/mgmapi/mgmapi.h
@@ -140,7 +140,6 @@
  */
 
 #include <ndb_types.h>
-#include <NdbTCP.h>
 #include "ndb_logevent.h"
 #include "mgmapi_config_parameters.h"
 
@@ -987,16 +986,6 @@ extern "C" {
 
 
   /**
-   * Convert connection to transporter
-   * @param   handle    NDB management handle.
-   *
-   * @return socket
-   *
-   * @note the socket is now able to be used as a transporter connection
-   */
-  NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle *handle);
-
-  /**
    * Get the node id of the mgm server we're connected to
    */
   Uint32 ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle);
diff --git a/ndb/include/mgmapi/mgmapi_debug.h b/ndb/include/mgmapi/mgmapi_debug.h
index 32a89535456..e86d9d4b768 100644
--- a/ndb/include/mgmapi/mgmapi_debug.h
+++ b/ndb/include/mgmapi/mgmapi_debug.h
@@ -132,42 +132,6 @@ extern "C" {
 				   const char * value,
 				   struct ndb_mgm_reply* reply);
 
-  /**
-   * Set an integer parameter for a connection
-   *
-   * @param handle the NDB management handle.
-   * @param node1 the node1 id
-   * @param node2 the node2 id
-   * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
-   * @param value what to set it to
-   * @param reply from ndb_mgmd
-   */
-  int ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
-					   int node1,
-					   int node2,
-					   int param,
-					   int value,
-					   struct ndb_mgm_reply* reply);
-
-  /**
-   * Get an integer parameter for a connection
-   *
-   * @param handle the NDB management handle.
-   * @param node1 the node1 id
-   * @param node2 the node2 id
-   * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
-   * @param value where to store the retreived value. In the case of 
-   * error, value is not changed.
-   * @param reply from ndb_mgmd
-   * @return 0 on success. < 0 on error.
-   */
-  int ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
-					   int node1,
-					   int node2,
-					   int param,
-					   int *value,
-					   struct ndb_mgm_reply* reply);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/ndb/src/common/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am
index b902012e56d..4c277097a91 100644
--- a/ndb/src/common/transporter/Makefile.am
+++ b/ndb/src/common/transporter/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp S
 libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
 libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
 
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi  -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
+INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index 0d04252a90b..cbe2ae5ca3b 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -49,6 +49,7 @@ extern int g_ndb_shm_signum;
 #include <OutputStream.hpp>
 
 #include <mgmapi/mgmapi.h>
+#include <mgmapi_internal.h>
 #include <mgmapi/mgmapi_debug.h>
 
 #include <EventLogger.hpp>
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index 99b6efe320b..67ee307bb68 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -23,6 +23,7 @@
 #include <NdbSleep.h>
 #include <NdbTCP.h>
 #include <mgmapi.h>
+#include <mgmapi_internal.h>
 #include <mgmapi_debug.h>
 #include "mgmapi_configuration.hpp"
 #include <socket_io.h>
diff --git a/ndb/src/mgmapi/mgmapi_internal.h b/ndb/src/mgmapi/mgmapi_internal.h
new file mode 100644
index 00000000000..90f93129f2a
--- /dev/null
+++ b/ndb/src/mgmapi/mgmapi_internal.h
@@ -0,0 +1,77 @@
+/* Copyright (C) 2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef MGMAPI_INTERNAL_H
+#define MGMAPI_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <NdbTCP.h>
+
+  /**
+   * Set an integer parameter for a connection
+   *
+   * @param handle the NDB management handle.
+   * @param node1 the node1 id
+   * @param node2 the node2 id
+   * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
+   * @param value what to set it to
+   * @param reply from ndb_mgmd
+   */
+  int ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
+					   int node1,
+					   int node2,
+					   int param,
+					   int value,
+					   struct ndb_mgm_reply* reply);
+
+  /**
+   * Get an integer parameter for a connection
+   *
+   * @param handle the NDB management handle.
+   * @param node1 the node1 id
+   * @param node2 the node2 id
+   * @param param the parameter (e.g. CFG_CONNECTION_SERVER_PORT)
+   * @param value where to store the retreived value. In the case of 
+   * error, value is not changed.
+   * @param reply from ndb_mgmd
+   * @return 0 on success. < 0 on error.
+   */
+  int ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
+					   int node1,
+					   int node2,
+					   int param,
+					   int *value,
+					   struct ndb_mgm_reply* reply);
+
+  /**
+   * Convert connection to transporter
+   * @param   handle    NDB management handle.
+   *
+   * @return socket
+   *
+   * @note the socket is now able to be used as a transporter connection
+   */
+  NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle *handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/ndb/src/ndbapi/ndb_cluster_connection.cpp b/ndb/src/ndbapi/ndb_cluster_connection.cpp
index 1990d2b6d52..49aded8e0ac 100644
--- a/ndb/src/ndbapi/ndb_cluster_connection.cpp
+++ b/ndb/src/ndbapi/ndb_cluster_connection.cpp
@@ -29,6 +29,7 @@
 #include <ConfigRetriever.hpp>
 #include <ndb_version.h>
 #include <mgmapi_debug.h>
+#include <mgmapi_internal.h>
 #include <md5_hash.hpp>
 
 #include <EventLogger.hpp>