1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
This commit is contained in:
unknown 2006-12-01 10:36:42 +01:00
commit 0184996b99
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -91,6 +91,7 @@ bin-dist: all
# Remove BK's "SCCS" subdirectories from source distribution # Remove BK's "SCCS" subdirectories from source distribution
dist-hook: dist-hook:
rm -rf `find $(distdir) -type d -name SCCS -print` rm -rf `find $(distdir) -type d -name SCCS -print`
rm -f `find $(distdir) -type l -print`
tags: tags:
support-files/build-tags support-files/build-tags

2
mysql-test/lib/mtr_process.pl
View File

@ -1053,7 +1053,7 @@ sub sleep_until_file_created ($$$) {
# Print extra message every 60 seconds # Print extra message every 60 seconds
my $seconds= ($loop * $sleeptime) / 1000; 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; my $left= $timeout - $seconds;
mtr_warning("Waited $seconds seconds for $pidfile to be created, " . mtr_warning("Waited $seconds seconds for $pidfile to be created, " .