From 3b1abddb25b722d12b5dbf224ca36e83df404e44 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 20:22:58 +0100 Subject: [PATCH 1/2] 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 2/2] 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, " .