From be2d78e3978abba3026d82f2c29dacfa0eb5c766 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Fri, 14 Dec 2007 10:47:01 +0100
Subject: [PATCH 1/2] BUG#31880 make test failure from public bk tree

---
 mysql-test/mysql-test-run.pl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 42298d635e7..7d7f5752787 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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;

From 26bd6a2cf12981d3f7ca184691b6b5c95dcc21aa Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Fri, 14 Dec 2007 10:51:05 +0100
Subject: [PATCH 2/2] typo

---
 mysql-test/mysql-test-run.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7d7f5752787..29c5648090c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1317,7 +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.
+  # A magic value in command_line_setup depends on these 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;