mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2004-12-22 07:23:21 +01:00
commit 890a97c7cd
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/include/transporter/TransporterDefinitions.hpp
View file

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

2
ndb/src/common/mgmcommon/IPCConfig.cpp
View file

@ -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",

4
ndb/src/common/transporter/TransporterRegistry.cpp
View file

@ -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,