Merge bk-internal:/home/bk/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@pilot.(none) 2007-06-19 11:34:54 +02:00
commit b8eee54d0b
3 changed files with 13 additions and 5 deletions

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> )
{

View File

@ -339,6 +339,7 @@ here is the sourced script
In loop
here is the sourced script
here is the sourced script
mysqltest: At line 1: Missing argument to sleep
mysqltest: At line 1: Missing argument to real_sleep
mysqltest: At line 1: Invalid argument to sleep "abc"

View File

@ -837,6 +837,10 @@ while ($num)
}
--enable_abort_on_error
--enable_query_log
# Test source $variable/<filename>
--source $MYSQLTEST_VARDIR/tmp/sourced.inc
--remove_file $MYSQLTEST_VARDIR/tmp/sourced.inc
# ----------------------------------------------------------------------------