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

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

3 files changed, 12 insertions, 4 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e3d4c33cba9..783d48b9f48 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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> )
   {
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 92265c94c4b..c71fbc4f5e0 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -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"
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 8dae94e271e..5bc004125c4 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -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
 
 # ----------------------------------------------------------------------------