Commit be2d78e3 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

BUG#31880 make test failure from public bk tree

parent a079cb9f
Loading
Loading
Loading
Loading
+4 −8
Original line number Diff line number Diff line
@@ -481,13 +481,8 @@ 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'} ) {
@@ -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;