From c2a9b34b92b65a0cbdced1364986b36d0422533c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 19:35:40 +0100 Subject: [PATCH 1/5] Makefile.am: "make distcheck" fix, "win" directory Makefile.am: "make distcheck" fix, "win" directory --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 1a0afdf25f4..d52951ec876 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,6 +92,7 @@ bin-dist: all # Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + mkdir -p "$(distdir)/win" if echo "$(distdir)" | grep -q '^/' ; then \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ From 1a32976dea2da73fd119aeae600aa2c85706bd54 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 19:41:48 +0100 Subject: [PATCH 2/5] Makefile.am: Corrected change to create "win" directory Makefile.am: Corrected change to create "win" directory --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d52951ec876..a3c3c2c08a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,12 +92,13 @@ bin-dist: all # Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` - mkdir -p "$(distdir)/win" 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"; \ From 3b1abddb25b722d12b5dbf224ca36e83df404e44 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 20:22:58 +0100 Subject: [PATCH 3/5] Makefile.am: Remove soft links before creating source TAR, to avoid file copies (bug#11865) Makefile.am: Remove soft links before creating source TAR, to avoid file copies (bug#11865) --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 12a867c1ad7..38e6a28b1b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,7 @@ bin-dist: all # Remove BK's "SCCS" subdirectories from source distribution dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + rm -f `find $(distdir) -type l -print` tags: support-files/build-tags From 5af42c1b25c72ca16bf1d8181007235640b46c73 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Nov 2006 13:16:12 +0100 Subject: [PATCH 4/5] minor fix to mtr_process.pl mysql-test/lib/mtr_process.pl: print extra message _once_ every 60 seconds --- mysql-test/lib/mtr_process.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 9d0c1f601ba..eef2f1b9dd5 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -1053,7 +1053,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, " . From 0bc42ce6336e6ae57376074d8755de2f58086549 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Nov 2006 22:45:55 +0100 Subject: [PATCH 5/5] late after-merge fix mysql-test/mysql-test-run.pl: late after-merge fix: re-add MTR_BUILD_THREAD=auto --- mysql-test/mysql-test-run.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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