Commit 9cb0a84c authored by unknown's avatar unknown

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

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


mysql-test/mysql-test-run.pl:
  Manual merge
parents 6bb66c75 3aa6d3f5
...@@ -3318,9 +3318,12 @@ sub find_testcase_skipped_reason($) ...@@ -3318,9 +3318,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> )
...@@ -3373,8 +3376,8 @@ sub analyze_testcase_failure($) ...@@ -3373,8 +3376,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> )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment