ndb_port_base is obsolete with WL#2278

6 files changed, 3 insertions, 18 deletions

diff --git a/configure.in b/configure.in
index e6ae8f8f70b..8690bf8e8af 100644
--- a/configure.in
+++ b/configure.in
@@ -2701,12 +2701,6 @@ then
 fi
 AC_SUBST([ndb_port])
 
-if test X"$ndb_port_base" = Xdefault
-then
-  ndb_port_base="2202"
-fi
-AC_SUBST([ndb_port_base])
-
 ndb_transporter_opt_objs=""
 if test "$ac_cv_func_shmget" = "yes" &&
    test "$ac_cv_func_shmat" = "yes" &&
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f204fee50ed..0b3995ac6c2 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1023,10 +1023,8 @@ sub ndbcluster_install () {
   }
   mtr_report("Install ndbcluster");
   my $ndbcluster_opts=  $opt_bench ? "" : "--small";
-  my $ndbcluster_port_base= $opt_ndbcluster_port + 2;
   if (  mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
 		["--port=$opt_ndbcluster_port",
-		 "--port-base=$ndbcluster_port_base",
 		 "--data-dir=$glob_mysql_test_dir/var",
 		 $ndbcluster_opts,
 		 "--initial"],
@@ -1067,7 +1065,6 @@ sub ndbcluster_stop () {
   {
     return;
   }
-  my $ndbcluster_port_base= $opt_ndbcluster_port + 2;
   # FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null
   mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
           ["--port=$opt_ndbcluster_port",
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index f0c1d2ba1b5..b1604fea2a6 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -497,8 +497,7 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
 
 export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
 
-NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`
-NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS"
+NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS"
 NDB_BACKUP_DIR=$MYSQL_TEST_DIR/var/ndbcluster-$NDBCLUSTER_PORT
 NDB_TOOLS_OUTPUT=$MYSQL_TEST_DIR/var/log/ndb_tools.log
 
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