diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-23 16:29:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-23 16:29:04 +0000 |
| commit | 1091fe23f63cbc7e2431edcab99ba98726b4c4a9 (patch) | |
| tree | 127fc36efc8bcbc74d47a4b71649045dedbd609d /mysql-test/ndb | |
| parent | b6d9222da3c2b0f6ec33efa6e16359b1630bad4a (diff) | |
| download | mariadb-git-1091fe23f63cbc7e2431edcab99ba98726b4c4a9.tar.gz | |
further simplifications of ndb config and aligned usage of mysql datadir in ndb
acinclude.m4:
added configure switch for ndb base port
configure.in:
ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index 259a1741710..03a94bf5a94 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -7,19 +7,11 @@ Diskless: CHOOSE_Diskless TimeBetweenWatchDogCheck: 30000 FileSystemPath: CHOOSE_FILESYSTEM -[COMPUTER] -Id: 1 -HostName: CHOOSE_HOSTNAME_1 - -[COMPUTER] -Id: 2 -HostName: CHOOSE_HOSTNAME_2 - [DB] -ExecuteOnComputer: 1 +HostName: CHOOSE_HOSTNAME_1 [DB] -ExecuteOnComputer: 2 +HostName: CHOOSE_HOSTNAME_2 [MGM] PortNumber: CHOOSE_PORT_MGM |