bk commit into 4.1 tree (kent:1.2485) BUG#16807

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2485 06/03/30 00:48:46 kent@stripped +1 -0
  mysql-test-run.pl:
    Check that port range is valid, bug#16807

  mysql-test/mysql-test-run.pl
    1.60 06/03/30 00:47:34 kent@stripped +11 -0
    Check that port range is valid, bug#16807

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1-new

--- 1.59/mysql-test/mysql-test-run.pl	2006-03-08 18:31:00 +01:00
+++ 1.60/mysql-test/mysql-test-run.pl	2006-03-30 00:47:34 +02:00
@@ -477,12 +477,23 @@
   # 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
   # all port numbers might not be used in this version of the script.
   #
+  # Also note the limiteation of ports we are allowed to hand out. This
+  # differs between operating systems and configuration, see
+  # http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
+  # But a fairly safe range seems to be 5001 - 32767
   if ( $ENV{'MTR_BUILD_THREAD'} )
   {
     # Up to two masters, up to three slaves
     $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 10 + 10000; # and 1
     $opt_slave_myport=    $opt_master_myport + 2;  # and 3 4
     $opt_ndbcluster_port= $opt_master_myport + 5;
+  }
+
+  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
+  {
+    mtr_error("MTR_BUILD_THREAD number results in a port",
+              "outside 5001 - 32767",
+              "($opt_master_myport - $opt_master_myport + 10)");
   }
 
   # Read the command line