Commit a55892ac authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 1548c6b7 375d7e01

ndb/include/transporter/TransporterDefinitions.hpp

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ struct TCP_TransporterConfiguration { 
 */

struct SHM_TransporterConfiguration {

  Uint32 port; 

  const char *remoteHostName;

  const char *localHostName;

  NodeId remoteNodeId;

  NodeId localNodeId;

  bool checksum;

ndb/src/common/mgmcommon/IPCConfig.cpp

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ IPCConfig::configureTransporters(Uint32 nodeId, 
      if(iter.get(CFG_SHM_BUFFER_MEM, &conf.shmSize)) break;

      

      conf.port= server_port;

      conf.localHostName  = localHostName;

      conf.remoteHostName = remoteHostName;



      if(!tr.createTransporter(&conf)){

        DBUG_PRINT("error", ("Failed to create SHM Transporter from %d to %d",

ndb/src/common/transporter/TransporterRegistry.cpp

+2 −2
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ TransporterRegistry::createTransporter(SHM_TransporterConfiguration *config) { 
    return false;



  SHM_Transporter * t = new SHM_Transporter(*this,

					    "localhost",

					    "localhost",

					    config->localHostName,

					    config->remoteHostName,

					    config->port,

					    localNodeId,

					    config->remoteNodeId,