diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:27:19 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:27:19 +0100 |
| commit | 114197b589dcc5612943fb967082f1c1be9d23a9 (patch) | |
| tree | 662a70d83022a3a00b8cadc2371e9a8ed8e023ba | |
| parent | a4342155a549fd527b761b36311a87ea3f863efb (diff) | |
| parent | 0bc42ce6336e6ae57376074d8755de2f58086549 (diff) | |
| download | mariadb-git-114197b589dcc5612943fb967082f1c1be9d23a9.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 1a0afdf25f4..9752075fe78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,11 +92,14 @@ bin-dist: all # Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + rm -f `find $(distdir) -type l -print` if echo "$(distdir)" | grep -q '^/' ; then \ + mkdir -p "$(distdir)/win" ; \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ --datadir="$(distdir)/win/data"; \ else \ + mkdir -p "$$(pwd)/$(distdir)/win" ; \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ --datadir="$$(pwd)/$(distdir)/win/data"; \ diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 79285de88a7..8a8b8d0858a 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -1059,7 +1059,7 @@ sub sleep_until_file_created ($$$) { # Print extra message every 60 seconds my $seconds= ($loop * $sleeptime) / 1000; - if ( $seconds > 1 and int($seconds) % 60 == 0 ) + if ( $seconds > 1 and int($seconds * 10) % 600 == 0 ) { my $left= $timeout - $seconds; mtr_warning("Waited $seconds seconds for $pidfile to be created, " . 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 |