only allocate extra-port (in tests) when needed

(otherwise 10 ports per worker will be not enough)

mysql-test/lib/My/ConfigFactory.pm

@@ -236,7 +236,6 @@ my @mysqld_rules=
  { 'pid-file' => \&fix_pidfile },
  { '#host' => \&fix_host },
  { 'port' => \&fix_port },
- { '#extra-port' => \&fix_port },
  { 'socket' => \&fix_socket },
  { '#log-error' => \&fix_log_error },
  { 'general-log' => sub { return 1; } },

mysql-test/suite/rpl/t/rpl_test_framework.cnf

@@ -17,18 +17,6 @@ log-slave-updates
 log-slave-updates
 [mysqld.9]
 log-slave-updates
-#[mysqld.10]
-#log-slave-updates
-#[mysqld.11]
-#log-slave-updates
-#[mysqld.12]
-#log-slave-updates
-#[mysqld.13]
-#log-slave-updates
-#[mysqld.14]
-#log-slave-updates
-#[mysqld.15]
-#log-slave-updates
 
 [ENV]
 SERVER_MYPORT_3= @mysqld.3.port
@@ -38,9 +26,3 @@ SERVER_MYPORT_6= @mysqld.6.port
 SERVER_MYPORT_7= @mysqld.7.port
 SERVER_MYPORT_8= @mysqld.8.port
 SERVER_MYPORT_9= @mysqld.9.port
-#SERVER_MYPORT_10= @mysqld.10.port
-#SERVER_MYPORT_11= @mysqld.11.port
-#SERVER_MYPORT_12= @mysqld.12.port
-#SERVER_MYPORT_13= @mysqld.13.port
-#SERVER_MYPORT_14= @mysqld.14.port
-#SERVER_MYPORT_15= @mysqld.15.port

mysql-test/t/connect.cnf

 !include include/default_my.cnf
 
 [mysqld.1]
-extra-port=        @mysqld.1.#extra-port
+extra-port=        @ENV.MASTER_EXTRA_PORT
 extra-max-connections=1
 
 [ENV]
-MASTER_EXTRA_PORT= @mysqld.1.#extra-port
+MASTER_EXTRA_PORT= @OPT.port

mysql-test/t/pool_of_threads.cnf

@@ -3,11 +3,11 @@
 [mysqld.1]
 loose-thread-handling=   pool-of-threads
 loose-thread_pool_size=  2
-extra-port=        @mysqld.1.#extra-port
+extra-port=        @ENV.MASTER_EXTRA_PORT
 extra-max-connections=1
 
 [client]
 connect-timeout=   2
 
 [ENV]
-MASTER_EXTRA_PORT= @mysqld.1.#extra-port
+MASTER_EXTRA_PORT= @OPT.port