Commit fd4761df authored by unknown's avatar unknown

Patches to make it compile

parent dbf87bf8
...@@ -370,7 +370,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, ...@@ -370,7 +370,7 @@ IPCConfig::configureTransporters(Uint32 nodeId,
tr.add_transporter_interface(localHostName, server_port); tr.add_transporter_interface(localHostName, server_port);
} }
DBUG_PRINT("info", ("Transporter between this node %d and node %d using port %d, signalId %d, checksum %d", DBUG_PRINT("info", ("Transporter between this node %d and node %d using port %d, signalId %d, checksum %d",
nodeId, remoteNodeId, tmp_server_port, sendSignalId, checksum)); nodeId, remoteNodeId, server_port, sendSignalId, checksum));
switch(type){ switch(type){
case CONNECTION_TYPE_SHM:{ case CONNECTION_TYPE_SHM:{
SHM_TransporterConfiguration conf; SHM_TransporterConfiguration conf;
...@@ -385,7 +385,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, ...@@ -385,7 +385,7 @@ IPCConfig::configureTransporters(Uint32 nodeId,
conf.port= server_port; conf.port= server_port;
if(!tr.createTransporter(&conf)){ if(!tr.createTransporter(&conf)){
DBUG_PRINT("error", ("Failed to create SCI Transporter from %d to %d", DBUG_PRINT("error", ("Failed to create SHM Transporter from %d to %d",
conf.localNodeId, conf.remoteNodeId)); conf.localNodeId, conf.remoteNodeId));
ndbout << "Failed to create SHM Transporter from: " ndbout << "Failed to create SHM Transporter from: "
<< conf.localNodeId << " to: " << conf.remoteNodeId << endl; << conf.localNodeId << " to: " << conf.remoteNodeId << endl;
...@@ -403,7 +403,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, ...@@ -403,7 +403,7 @@ IPCConfig::configureTransporters(Uint32 nodeId,
conf.remoteNodeId = remoteNodeId; conf.remoteNodeId = remoteNodeId;
conf.checksum = checksum; conf.checksum = checksum;
conf.signalId = sendSignalId; conf.signalId = sendSignalId;
conf.port= tmp_server_port; conf.port= server_port;
if(iter.get(CFG_SCI_HOSTNAME_1, &host1)) break; if(iter.get(CFG_SCI_HOSTNAME_1, &host1)) break;
if(iter.get(CFG_SCI_HOSTNAME_2, &host2)) break; if(iter.get(CFG_SCI_HOSTNAME_2, &host2)) break;
......
...@@ -107,7 +107,6 @@ TransporterRegistry::TransporterRegistry(void * callback, ...@@ -107,7 +107,6 @@ TransporterRegistry::TransporterRegistry(void * callback,
unsigned _maxTransporters, unsigned _maxTransporters,
unsigned sizeOfLongSignalMemory) { unsigned sizeOfLongSignalMemory) {
m_transporter_service= 0;
nodeIdSpecified = false; nodeIdSpecified = false;
maxTransporters = _maxTransporters; maxTransporters = _maxTransporters;
sendCounter = 1; sendCounter = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment