diff options
| author | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2005-01-11 21:00:53 +0400 |
| commit | 196c95e938ecced55a9fb0931fb5c9fb564d6866 (patch) | |
| tree | a016853c9385e1555657e606886d3588657139ab /mysql-test/ndb | |
| parent | ee72592bfddf9522d1d08db5daf4e12e78f22661 (diff) | |
| parent | 2bd854c859c347156c39171d3d82e96608b87068 (diff) | |
| download | mariadb-git-196c95e938ecced55a9fb0931fb5c9fb564d6866.tar.gz | |
Merging conflicts resolved
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index 8c89d2aa2cc..c831a5c7ffa 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -9,13 +9,13 @@ DataDir= CHOOSE_FILESYSTEM MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes [ndbd] -HostName= CHOOSE_HOSTNAME_1 +HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress [ndbd] -HostName= CHOOSE_HOSTNAME_2 +HostName= CHOOSE_HOSTNAME_2 # hostname is a valid network adress [ndb_mgmd] -DataDir= CHOOSE_FILESYSTEM +DataDir= CHOOSE_FILESYSTEM # PortNumber= CHOOSE_PORT_MGM [mysqld] |