diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
| commit | 8bb0aaa51661bc842832ad131cb43b6f0e50f29a (patch) | |
| tree | 0138fe722f01dc674c37ea0e9b7f181bcd863f82 /mysql-test/ndb | |
| parent | 1e91f015caeeec47c65b754d19ac956d79ded31d (diff) | |
| parent | 9f2b7e91b6a6eee0e4e1629ea4d55782a81c78bb (diff) | |
| download | mariadb-git-8bb0aaa51661bc842832ad131cb43b6f0e50f29a.tar.gz | |
Merge
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
SCCS merged
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index 03a94bf5a94..a395b300df4 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -1,28 +1,28 @@ -[DB DEFAULT] -NoOfReplicas: 2 -MaxNoOfConcurrentOperations: CHOOSE_MaxNoOfConcurrentOperations -DataMemory: CHOOSE_DataMemory -IndexMemory: CHOOSE_IndexMemory -Diskless: CHOOSE_Diskless -TimeBetweenWatchDogCheck: 30000 -FileSystemPath: CHOOSE_FILESYSTEM - -[DB] +[ndbd default] +NoOfReplicas= 2 +MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations +DataMemory= CHOOSE_DataMemory +IndexMemory= CHOOSE_IndexMemory +Diskless= CHOOSE_Diskless +TimeBetweenWatchDogCheck= 30000 +FileSystemPath= CHOOSE_FILESYSTEM + +[ndbd] HostName: CHOOSE_HOSTNAME_1 -[DB] +[ndbd] HostName: CHOOSE_HOSTNAME_2 -[MGM] -PortNumber: CHOOSE_PORT_MGM +[ndb_mgmd] +PortNumber= CHOOSE_PORT_MGM -[API] +[mysqld] -[API] +[mysqld] -[API] +[mysqld] -[API] +[mysqld] -[TCP DEFAULT] -PortNumber: CHOOSE_PORT_TRANSPORTER +[tcp default] +PortNumber= CHOOSE_PORT_TRANSPORTER |