Commit 7ba75eb8 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 89f616a6 35261ab3

ndb/include/mgmapi/mgmapi.h

+5 −1
Original line number Diff line number Diff line
@@ -994,8 +994,12 @@ extern "C" { 
   *

   * @note the socket is now able to be used as a transporter connection

   */

  NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle handle);

  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);



  /**

   * Config iterator

ndb/include/mgmcommon/ConfigRetriever.hpp

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public: 
  const char *get_mgmd_host() const;

  const char *get_connectstring(char *buf, int buf_sz) const;

  NdbMgmHandle get_mgmHandle() { return m_handle; };

  NdbMgmHandle* get_mgmHandlePtr() { return &m_handle; };



  Uint32 get_configuration_nodeid() const;

private:

ndb/include/transporter/TransporterRegistry.hpp

+10 −1
Original line number Diff line number Diff line
@@ -116,11 +116,20 @@ public: 
   */

  bool connect_server(NDB_SOCKET_TYPE sockfd);



  bool connect_client(NdbMgmHandle *h);



  /**

   * use a mgmd connection to connect as a transporter

   * Given a SocketClient, creates a NdbMgmHandle, turns it into a transporter

   * and returns the socket.

   */

  NDB_SOCKET_TYPE connect_ndb_mgmd(SocketClient *sc);



  /**

   * Given a connected NdbMgmHandle, turns it into a transporter

   * and returns the socket.

   */

  NDB_SOCKET_TYPE connect_ndb_mgmd(NdbMgmHandle *h);



  /**

   * Remove all transporters

   */

ndb/src/common/transporter/Transporter.cpp

+9 −0
Original line number Diff line number Diff line
@@ -124,6 +124,15 @@ Transporter::connect_client() { 
  else

    sockfd= m_socket_client->connect();



  connect_client(sockfd);

}  



bool

Transporter::connect_client(NDB_SOCKET_TYPE sockfd) {



  if(m_connected)

    return true;



  if (sockfd == NDB_INVALID_SOCKET)

    return false;

ndb/src/common/transporter/Transporter.hpp

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public: 
   *    Use isConnected() to check status

   */

  bool connect_client();

  bool connect_client(NDB_SOCKET_TYPE sockfd);

  bool connect_server(NDB_SOCKET_TYPE socket);



  /**