bk commit into 5.0 tree (df:1.2318)

[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, 2006-12-01 10:27:19+01:00, df@stripped +2 -0
  Merge dfischer@stripped:/home/bk/mysql-5.0
  into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
  MERGE: 1.2301.12.13

  mysql-test/lib/mtr_process.pl@stripped, 2006-12-01 10:27:15+01:00, df@stripped +0
-0
    Auto merged
    MERGE: 1.43.1.1

  mysql-test/mysql-test-run.pl@stripped, 2006-12-01 10:27:15+01:00, df@stripped +0
-0
    Auto merged
    MERGE: 1.156.1.1

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.0-build/RESYNC

--- 1.44/mysql-test/lib/mtr_process.pl	2006-11-23 20:55:33 +01:00
+++ 1.45/mysql-test/lib/mtr_process.pl	2006-12-01 10:27:15 +01:00
@@ -1059,7 +1059,7 @@ sub sleep_until_file_created ($$$) {
 
     # Print extra message every 60 seconds
     my $seconds= ($loop * $sleeptime) / 1000;
-    if ( $seconds > 1 and int($seconds) % 60 == 0 )
+    if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )
     {
       my $left= $timeout - $seconds;
       mtr_warning("Waited $seconds seconds for $pidfile to be created, " .

--- 1.157/mysql-test/mysql-test-run.pl	2006-11-29 15:22:14 +01:00
+++ 1.158/mysql-test/mysql-test-run.pl	2006-12-01 10:27:15 +01:00
@@ -1233,8 +1233,14 @@ sub command_line_setup () {
 # But a fairly safe range seems to be 5001 - 32767
 #
 
-sub set_mtr_build_thread_ports() {
+sub set_mtr_build_thread_ports($) {
   my $mtr_build_thread= shift;
+
+  if ( lc($mtr_build_thread) eq 'auto' ) {
+    print "Requesting build thread... ";
+    $ENV{'MTR_BUILD_THREAD'} = $mtr_build_thread =
mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
+    print "got ".$mtr_build_thread."\n";
+  }
 
   # Up to two masters, up to three slaves
   $opt_master_myport=         $mtr_build_thread * 10 + 10000; # and 1