Commit 213a9f3e authored by unknown's avatar unknown
Browse files

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

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

ndb/include/mgmapi/mgmapi.h

+0 −11
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ 
 */



#include <ndb_types.h>

#include <NdbTCP.h>

#include "ndb_logevent.h"

#include "mgmapi_config_parameters.h"
@@ -986,16 +985,6 @@ extern "C" { 
			   unsigned version, int nodetype);





  /**

   * 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

   */

ndb/include/mgmapi/mgmapi_debug.h

+0 −36
Original line number Diff line number Diff line
@@ -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

ndb/src/common/transporter/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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

ndb/src/common/transporter/TransporterRegistry.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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>

ndb/src/mgmapi/mgmapi.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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>