diff options
| author | unknown <mysql@mc04.(none)> | 2004-09-20 14:20:01 +0200 |
|---|---|---|
| committer | unknown <mysql@mc04.(none)> | 2004-09-20 14:20:01 +0200 |
| commit | dbf87bf89915eb0200f43c9bdf47d08ddc4f83ec (patch) | |
| tree | 5fc51f84bc7cb84d221ac0cb747915f6483397bc /ndb/include | |
| parent | 7f1fcf6648c6c4a29b94360fd47f53e90812cb98 (diff) | |
| parent | 48e56f47a62829480803a7bdfe46d6ebbea17c47 (diff) | |
| download | mariadb-git-dbf87bf89915eb0200f43c9bdf47d08ddc4f83ec.tar.gz | |
Hand merge
acinclude.m4:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/mgmapi/mgmapi_config_parameters.h | 18 | ||||
| -rw-r--r-- | ndb/include/transporter/TransporterDefinitions.hpp | 12 |
2 files changed, 11 insertions, 19 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index e0ad06c322f..3110d3bc830 100644 --- a/ndb/include/mgmapi/mgmapi_config_parameters.h +++ b/ndb/include/mgmapi/mgmapi_config_parameters.h @@ -121,16 +121,14 @@ #define CFG_SHM_KEY 502 #define CFG_SHM_BUFFER_MEM 503 -#define CFG_SCI_ID_0 550 -#define CFG_SCI_ID_1 551 -#define CFG_SCI_SEND_LIMIT 552 -#define CFG_SCI_BUFFER_MEM 553 -#define CFG_SCI_NODE1_ADAPTERS 554 -#define CFG_SCI_NODE1_ADAPTER0 555 -#define CFG_SCI_NODE1_ADAPTER1 556 -#define CFG_SCI_NODE2_ADAPTERS 554 -#define CFG_SCI_NODE2_ADAPTER0 555 -#define CFG_SCI_NODE2_ADAPTER1 556 +#define CFG_SCI_HOST1_ID_0 550 +#define CFG_SCI_HOST1_ID_1 551 +#define CFG_SCI_HOST2_ID_0 552 +#define CFG_SCI_HOST2_ID_1 553 +#define CFG_SCI_HOSTNAME_1 554 +#define CFG_SCI_HOSTNAME_2 555 +#define CFG_SCI_SEND_LIMIT 556 +#define CFG_SCI_BUFFER_MEM 557 #define CFG_OSE_PRIO_A_SIZE 602 #define CFG_OSE_PRIO_B_SIZE 603 diff --git a/ndb/include/transporter/TransporterDefinitions.hpp b/ndb/include/transporter/TransporterDefinitions.hpp index 445e8b889d2..a8da8068552 100644 --- a/ndb/include/transporter/TransporterDefinitions.hpp +++ b/ndb/include/transporter/TransporterDefinitions.hpp @@ -59,8 +59,6 @@ struct TCP_TransporterConfiguration { NodeId localNodeId; Uint32 sendBufferSize; // Size of SendBuffer of priority B Uint32 maxReceiveSize; // Maximum no of bytes to receive - Uint32 byteOrder; - bool compression; bool checksum; bool signalId; }; @@ -72,10 +70,8 @@ struct SHM_TransporterConfiguration { Uint32 port; NodeId remoteNodeId; NodeId localNodeId; - bool compression; bool checksum; bool signalId; - int byteOrder; Uint32 shmKey; Uint32 shmSize; @@ -89,10 +85,8 @@ struct OSE_TransporterConfiguration { const char *localHostName; NodeId remoteNodeId; NodeId localNodeId; - bool compression; bool checksum; bool signalId; - int byteOrder; Uint32 prioASignalSize; Uint32 prioBSignalSize; @@ -103,20 +97,20 @@ struct OSE_TransporterConfiguration { * SCI Transporter Configuration */ struct SCI_TransporterConfiguration { + const char *remoteHostName; + const char *localHostName; + Uint32 port; Uint32 sendLimit; // Packet size Uint32 bufferSize; // Buffer size Uint32 nLocalAdapters; // 1 or 2, the number of adapters on local host - Uint32 nRemoteAdapters; Uint32 remoteSciNodeId0; // SCInodeId for adapter 1 Uint32 remoteSciNodeId1; // SCInodeId for adapter 2 NodeId localNodeId; // Local node Id NodeId remoteNodeId; // Remote node Id - Uint32 byteOrder; - bool compression; bool checksum; bool signalId; |