1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2007-06-13 10:37:31 +02:00

View File

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