ndb_port_base is obsolete with WL#2278

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

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

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