diff options
| author | unknown <mysql@mc04.(none)> | 2004-09-20 16:30:23 +0200 |
|---|---|---|
| committer | unknown <mysql@mc04.(none)> | 2004-09-20 16:30:23 +0200 |
| commit | 38dc00118c2d735ff4a12d6aeab9324de40c3473 (patch) | |
| tree | 6430c548ef7389a6a7d808bde3071cad669f6db7 /ndb | |
| parent | 710b19349b79aad600f87de4c6da6244ff37a6fb (diff) | |
| download | mariadb-git-38dc00118c2d735ff4a12d6aeab9324de40c3473.tar.gz | |
Patches to make it compile
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/common/mgmcommon/IPCConfig.cpp | 6 | ||||
| -rw-r--r-- | ndb/src/common/transporter/TransporterRegistry.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ndb/src/common/mgmcommon/IPCConfig.cpp b/ndb/src/common/mgmcommon/IPCConfig.cpp index 285df61f8a2..b70881dd830 100644 --- a/ndb/src/common/mgmcommon/IPCConfig.cpp +++ b/ndb/src/common/mgmcommon/IPCConfig.cpp @@ -370,7 +370,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, 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", - nodeId, remoteNodeId, tmp_server_port, sendSignalId, checksum)); + nodeId, remoteNodeId, server_port, sendSignalId, checksum)); switch(type){ case CONNECTION_TYPE_SHM:{ SHM_TransporterConfiguration conf; @@ -385,7 +385,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, conf.port= server_port; 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)); ndbout << "Failed to create SHM Transporter from: " << conf.localNodeId << " to: " << conf.remoteNodeId << endl; @@ -403,7 +403,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, conf.remoteNodeId = remoteNodeId; conf.checksum = checksum; 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_2, &host2)) break; diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp index 1608444e739..cacbbed00f1 100644 --- a/ndb/src/common/transporter/TransporterRegistry.cpp +++ b/ndb/src/common/transporter/TransporterRegistry.cpp @@ -107,7 +107,6 @@ TransporterRegistry::TransporterRegistry(void * callback, unsigned _maxTransporters, unsigned sizeOfLongSignalMemory) { - m_transporter_service= 0; nodeIdSpecified = false; maxTransporters = _maxTransporters; sendCounter = 1; |