diff options
| author | unknown <df@kahlann.erinye.com> | 2006-11-30 22:45:55 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-11-30 22:45:55 +0100 |
| commit | 0bc42ce6336e6ae57376074d8755de2f58086549 (patch) | |
| tree | e979bc4d19fe98a169a09e662b6192fbc47777bf | |
| parent | 32f0650142866cdf8ab6674b52495cc204f853e3 (diff) | |
| download | mariadb-git-0bc42ce6336e6ae57376074d8755de2f58086549.tar.gz | |
late after-merge fix
mysql-test/mysql-test-run.pl:
late after-merge fix: re-add MTR_BUILD_THREAD=auto
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a28bd651ab6..6aacbfdf1ad 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1233,9 +1233,15 @@ 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 $opt_slave_myport= $opt_master_myport + 2; # and 3 4 |