Commit e003d8ad authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

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

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
parents b6bd61d4 caebb719

mysql-test/mysql-test-run.pl

+7 −4
Original line number Diff line number Diff line
@@ -3106,9 +3106,12 @@ sub find_testcase_skipped_reason($) 
{

  my ($tinfo)= @_;



  # Set default message

  $tinfo->{'comment'}= "Detected by testcase(no log file)";



  # 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;

  my $reason;



  while ( my $line= <$F> )
@@ -3161,8 +3164,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> )

  {

mysql-test/r/mysqltest.result

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,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"

mysql-test/t/mysqltest.test

+4 −0
Original line number Diff line number Diff line
@@ -807,6 +807,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



# ----------------------------------------------------------------------------