database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Code Activity

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

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
This commit is contained in:
msvensson@pilot.(none)
2007-06-19 11:30:45 +02:00
parent b6bd61d4d4 caebb719b2
commit e003d8ad3b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.pl
View File

@@ -3106,9 +3106,12 @@ sub find_testcase_skipped_reason($)
{ {
my ($tinfo)= @_; my ($tinfo)= @_;
# Set default message
$tinfo->{'comment'}= "Detected by testcase(no log file)";
# 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;
my $reason; my $reason;
while ( my $line= <$F> ) while ( my $line= <$F> )
@@ -3161,8 +3164,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> )
{ {

1
mysql-test/r/mysqltest.result
View File

@@ -330,6 +330,7 @@ here is the sourced script
In loop In loop
here is the sourced script 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 sleep
mysqltest: At line 1: Missing argument to real_sleep mysqltest: At line 1: Missing argument to real_sleep
mysqltest: At line 1: Invalid argument to sleep "abc" mysqltest: At line 1: Invalid argument to sleep "abc"

4
mysql-test/t/mysqltest.test
View File

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