List:Commits« Previous MessageNext Message »
From:kent Date:January 28 2006 12:04pm
Subject:bk commit into 4.1 tree (kent:1.2467)
View as plain text  
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.2467 06/01/28 13:04:01 kent@stripped +1 -0
  mysql-test-run.pl:
    Aligned the MTR_BUILD_THREAD policy to shell version

  mysql-test/mysql-test-run.pl
    1.52 06/01/28 13:03:27 kent@stripped +13 -3
    Aligned the MTR_BUILD_THREAD policy to shell version

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

--- 1.51/mysql-test/mysql-test-run.pl	2005-11-14 00:58:39 +01:00
+++ 1.52/mysql-test/mysql-test-run.pl	2006-01-28 13:03:27 +01:00
@@ -463,11 +463,21 @@
   my $opt_slave_myport=  9308;
   $opt_ndbcluster_port=  9350;
 
+  #
+  # To make it easier for different devs to work on the same host,
+  # an environment variable can be used to control all ports. A small
+  # number is to be used, 0 - 16 or similar.
+  #
+  # Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
+  # versions of this script, else a 4.0 test run might conflict with a
+  # 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.
+  #
   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;
+    $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 10 + 10000;
+    $opt_slave_myport=    $opt_master_myport + 3;
+    $opt_ndbcluster_port= $opt_master_myport + 4;
   }
 
   # Read the command line
Thread
bk commit into 4.1 tree (kent:1.2467)kent28 Jan