Commit 32f06501 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/lib/mtr_process.pl:
  Auto merged
parents f380caa8 5af42c1b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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, " .