database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge kahlann.erinye.com:/home/df/mysql/build/51

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge
This commit is contained in:
df@kahlann.erinye.com
2006-11-28 19:53:43 +01:00
parent 93f246d4c1 e99c548bcd
commit 998b05f245
31 changed files with 274 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/mysql-test-run.pl
View File

@ -66,7 +66,6 @@ use IO::Socket::INET;
use Data::Dumper;
use strict;
use warnings;
use diagnostics;
select(STDOUT);
$| = 1; # Automatically flush STDOUT
@ -88,6 +87,7 @@ require "lib/mtr_diff.pl";
require "lib/mtr_match.pl";
require "lib/mtr_misc.pl";
require "lib/mtr_stress.pl";
require "lib/mtr_unique.pl";
$Devel::Trace::TRACE= 1;
@ -448,7 +448,6 @@ sub main () {
mtr_exit(0);
}
##############################################################################
#
# Default settings
@ -472,6 +471,12 @@ sub command_line_setup () {
if ( $ENV{'MTR_BUILD_THREAD'} )
{
# If so requested, we try to avail ourselves of a unique build thread number.
if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) {
print "Requesting build thread... ";
$ENV{'MTR_BUILD_THREAD'} = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
print "got ".$ENV{'MTR_BUILD_THREAD'}."\n";
}
set_mtr_build_thread_ports($ENV{'MTR_BUILD_THREAD'});
}