Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@pilot.(none) 2007-06-13 10:36:47 +02:00
commit 36ae2387a9

View File

@ -3318,9 +3318,12 @@ sub find_testcase_skipped_reason($)
{
my ($tinfo)= @_;
# Open mysqltest-time
my $F= IO::File->new($path_timefile) or
mtr_error("can't open file \"$path_timefile\": $!");
# Set default message
$tinfo->{'comment'}= "Detected by testcase(no log file)";
# Open mysqltest-time(the mysqltest log file)
my $F= IO::File->new($path_timefile)
or return;
my $reason;
while ( my $line= <$F> )
@ -3373,8 +3376,8 @@ sub analyze_testcase_failure($)
my ($tinfo)= @_;
# Open mysqltest.log
my $F= IO::File->new($path_timefile) or
mtr_error("can't open file \"$path_timefile\": $!");
my $F= IO::File->new($path_timefile)
or return;
while ( my $line= <$F> )
{