summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.bredbandsbolaget.se>2004-06-17 22:19:26 +0000
committerunknown <tomas@poseidon.bredbandsbolaget.se>2004-06-17 22:19:26 +0000
commit67b7c20172ffe6d6b38100a176193d137dbe5fb0 (patch)
treeead304e1d5b39b0bf190945542a5efab16276326 /mysql-test
parent41b0444ca82052449bf1eac07b2bfe7f270c3839 (diff)
parent79359964b818bbb46ded284d4e360ea87ffe4f3a (diff)
downloadmariadb-git-67b7c20172ffe6d6b38100a176193d137dbe5fb0.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1 ndb/src/common/mgmcommon/InitConfigFileParser.cpp: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini60
1 files changed, 1 insertions, 59 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index c4ff0aba80a..5acb757d253 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -73,63 +73,5 @@ ExecuteOnComputer: 6
Id: 14
ExecuteOnComputer: 7
-# Mgmtsrvr connections
-
-[TCP]
-NodeId1: 1
-NodeId2: 2
+[TCP DEFAULT]
PortNumber: CHOOSE_PORT_BASE02
-
-[TCP]
-NodeId1: 1
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE03
-
-# Ndb nodes connections
-
-[TCP]
-NodeId1: 2
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE04
-
-# Api connections
-
-[TCP]
-NodeId1: 11
-NodeId2: 2
-PortNumber: CHOOSE_PORT_BASE05
-
-[TCP]
-NodeId1: 11
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE06
-
-[TCP]
-NodeId1: 12
-NodeId2: 2
-PortNumber: CHOOSE_PORT_BASE07
-
-[TCP]
-NodeId1: 12
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE08
-
-[TCP]
-NodeId1: 13
-NodeId2: 2
-PortNumber: CHOOSE_PORT_BASE09
-
-[TCP]
-NodeId1: 13
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE10
-
-[TCP]
-NodeId1: 14
-NodeId2: 2
-PortNumber: CHOOSE_PORT_BASE11
-
-[TCP]
-NodeId1: 14
-NodeId2: 3
-PortNumber: CHOOSE_PORT_BASE12