diff options
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 18633d095b0..fb94cb80ee5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -504,14 +504,9 @@ sub command_line_setup () { 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' ) { @@ -1369,6 +1364,7 @@ sub set_mtr_build_thread_ports($) { } # Up to two masters, up to three slaves + # 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; |