Commit 890a97c7 authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents f1fe6e17 78ce1785
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -68,6 +68,8 @@ struct TCP_TransporterConfiguration { ...@@ -68,6 +68,8 @@ struct TCP_TransporterConfiguration {
*/ */
struct SHM_TransporterConfiguration { struct SHM_TransporterConfiguration {
Uint32 port; Uint32 port;
const char *remoteHostName;
const char *localHostName;
NodeId remoteNodeId; NodeId remoteNodeId;
NodeId localNodeId; NodeId localNodeId;
bool checksum; bool checksum;
......
...@@ -383,6 +383,8 @@ IPCConfig::configureTransporters(Uint32 nodeId, ...@@ -383,6 +383,8 @@ IPCConfig::configureTransporters(Uint32 nodeId,
if(iter.get(CFG_SHM_BUFFER_MEM, &conf.shmSize)) break; if(iter.get(CFG_SHM_BUFFER_MEM, &conf.shmSize)) break;
conf.port= server_port; conf.port= server_port;
conf.localHostName = localHostName;
conf.remoteHostName = remoteHostName;
if(!tr.createTransporter(&conf)){ if(!tr.createTransporter(&conf)){
DBUG_PRINT("error", ("Failed to create SHM Transporter from %d to %d", DBUG_PRINT("error", ("Failed to create SHM Transporter from %d to %d",
......
...@@ -358,8 +358,8 @@ TransporterRegistry::createTransporter(SHM_TransporterConfiguration *config) { ...@@ -358,8 +358,8 @@ TransporterRegistry::createTransporter(SHM_TransporterConfiguration *config) {
return false; return false;
SHM_Transporter * t = new SHM_Transporter(*this, SHM_Transporter * t = new SHM_Transporter(*this,
"localhost", config->localHostName,
"localhost", config->remoteHostName,
config->port, config->port,
localNodeId, localNodeId,
config->remoteNodeId, config->remoteNodeId,
......
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