bk commit into 5.0 tree (df:1.2576) BUG#31880

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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@stripped, 2007-12-14 10:47:01+01:00, df@stripped +1 -0
  BUG#31880 make test failure from public bk tree

  mysql-test/mysql-test-run.pl@stripped, 2007-12-14 10:46:59+01:00, df@stripped +4 -8
    BUG#31880 make test failure from public bk tree
    
    Instead of handling "MTR_BUILD_THREAD set" and "MTR_BUILD_THREAD not set" differently, use the same subroutine to set up the port numbers. The addition of a second master apparently broke the old static port numbers.

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-12-07 22:43:29 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-12-14 10:46:59 +01:00
@@ -481,14 +481,9 @@ sub command_line_setup () {
   $opt_suite=        "main";    # Special default suite
   my $opt_comment;
 
-  $opt_master_myport=          9306;
-  $opt_slave_myport=           9308;
-  $opt_ndbcluster_port=        9310;
-  $opt_ndbcluster_port_slave=  9311;
-  $im_port=                    9312;
-  $im_mysqld1_port=            9313;
-  $im_mysqld2_port=            9314;
-  
+  # Magic number -69.4 results in traditional test ports starting from 9306.
+  set_mtr_build_thread_ports(-69.4);
+
   # If so requested, we try to avail ourselves of a unique build thread number.
   if ( $ENV{'MTR_BUILD_THREAD'} ) {
     if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) {
@@ -1322,6 +1317,7 @@ sub set_mtr_build_thread_ports($) {
   }
 
   # Up to two masters, up to three slaves
+  # A magic value in command_line_setup depends on thse equations.
   $opt_master_myport=         $mtr_build_thread * 10 + 10000; # and 1
   $opt_slave_myport=          $opt_master_myport + 2;  # and 3 4
   $opt_ndbcluster_port=       $opt_master_myport + 5;