Commit f367a348 authored by unknown's avatar unknown

BUG#31880 make test failure from public bk tree


mysql-test/mysql-test-run.pl:
  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.
parent 9e5ed260
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment