diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-09 19:29:37 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-09 19:29:37 +0100 |
| commit | 666f899e63baa380e6047babd64f1be830ef4b9a (patch) | |
| tree | 800ed29cefe9804b4ed58e5701cdc1ab58487f22 /mysql-test/ndb | |
| parent | 7f056654b9957fa300d2e9fac4129cbb7f18dbe9 (diff) | |
| download | mariadb-git-666f899e63baa380e6047babd64f1be830ef4b9a.tar.gz | |
ndb_port_base is obsolete with WL#2278
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/Makefile.am | 1 | ||||
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 4 | ||||
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/ndb/Makefile.am b/mysql-test/ndb/Makefile.am index 502ccee099e..178e40fb19a 100644 --- a/mysql-test/ndb/Makefile.am +++ b/mysql-test/ndb/Makefile.am @@ -14,7 +14,6 @@ SUFFIXES = .sh @RM@ -f $@ $@-t @SED@ \ -e 's!@''ndb_port''@!$(ndb_port)!g' \ - -e 's!@''ndb_port_base''@!$(ndb_port_base)!g' \ -e 's!@''ndbbindir''@!$(ndbbindir)!g' \ -e 's!@''ndbtoolsdir''@!$(ndbtoolsdir)!g' \ $< > $@-t diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index c831a5c7ffa..a6a56376f33 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -15,6 +15,7 @@ HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress HostName= CHOOSE_HOSTNAME_2 # hostname is a valid network adress [ndb_mgmd] +HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress DataDir= CHOOSE_FILESYSTEM # PortNumber= CHOOSE_PORT_MGM @@ -25,6 +26,3 @@ PortNumber= CHOOSE_PORT_MGM [mysqld] [mysqld] - -[tcp default] -PortNumber= CHOOSE_PORT_TRANSPORTER diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index 16bb3a9b122..c09c013552e 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -6,7 +6,6 @@ # configurable parameters, make sure to change in mysqlcluterd as well port=@ndb_port@ -port_base=@ndb_port_base@ fsdir=`pwd` # end configurable parameters @@ -96,7 +95,7 @@ while test $# -gt 0; do port=`echo "$1" | sed -e "s;--port=;;"` ;; --port-base=*) - port_base=`echo "$1" | sed -e "s;--port-base=;;"` + $ECHO "--port-base option depricated. Ignored." ;; --ndb_mgm-extra-opts=*) NDB_MGM_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgm-extra-opts=;;"` @@ -192,7 +191,6 @@ if [ $initial_ndb ] ; then -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \ -e s,"CHOOSE_FILESYSTEM","$fs_ndb",g \ -e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \ - -e s,"CHOOSE_PORT_TRANSPORTER","$port_base",g \ < ndb/ndb_config_2_node.ini \ > "$fs_ndb/config.ini" fi |