bk commit into 4.1 tree (kent:1.2464)

[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.2464 05/10/26 01:24:03 kent@stripped +1 -0
  mysql-test-run.pl:
    Added MTR_BUILD_THREAD to control the port range

  mysql-test/mysql-test-run.pl
    1.49 05/10/26 01:23:26 kent@stripped +29 -3
    Added MTR_BUILD_THREAD to control the port range

# 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-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1

--- 1.48/mysql-test/mysql-test-run.pl	2005-09-30 00:49:04 +02:00
+++ 1.49/mysql-test/mysql-test-run.pl	2005-10-26 01:23:26 +02:00
@@ -462,6 +462,13 @@
   my $opt_slave_myport=  9308;
   $opt_ndbcluster_port=  9350;
 
+  if ( $ENV{'MTR_BUILD_THREAD'} )
+  {
+    $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 40 + 8120;
+    $opt_slave_myport=    $opt_master_myport + 16;
+    $opt_ndbcluster_port= $opt_master_myport + 24;
+  }
+
   # Read the command line
   # Note: Keep list, and the order, in sync with usage at end of this file
 
@@ -833,7 +840,9 @@
     {
       $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
                                            "$glob_basedir/bin");
-      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt");
+      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",
+                                           "$path_client_bindir/mysqld",
+                                           "$path_client_bindir/mysqld-debug",);
       $path_language=      mtr_path_exists("$glob_basedir/share/english/");
       $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets");
     }
@@ -886,8 +895,18 @@
                                          "$glob_basedir/share/english/");
     $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/mysql/charsets",
                                          "$glob_basedir/share/charsets");
-    $exe_mysqld=         mtr_exe_exists ("$glob_basedir/libexec/mysqld",
-                                         "$glob_basedir/bin/mysqld");
+
+    if ( $glob_win32 )
+    {
+      $exe_mysqld=         mtr_exe_exists ("$glob_basedir/bin/mysqld-nt",
+                                           "$glob_basedir/bin/mysqld",
+                                           "$glob_basedir/bin/mysqld-debug",);
+    }
+    else
+    {
+      $exe_mysqld=         mtr_exe_exists ("$glob_basedir/libexec/mysqld",
+                                           "$glob_basedir/bin/mysqld");
+    }
 
     if ( $glob_use_embedded_server )
     {
@@ -971,6 +990,13 @@
       chomp($ENV{$key});
     }
   }
+
+  # We are nice and report a bit about our settings
+  print "Using MTR_BUILD_THREAD = ",$ENV{MTR_BUILD_THREAD} || 0,"\n";
+  print "Using MASTER_MYPORT    = $ENV{MASTER_MYPORT}\n";
+  print "Using MASTER_MYPORT1   = $ENV{MASTER_MYPORT1}\n";
+  print "Using SLAVE_MYPORT     = $ENV{SLAVE_MYPORT}\n";
+  print "Using NDBCLUSTER_PORT  = $opt_ndbcluster_port\n";
 }