bzr commit into mysql-trunk-mtr branch (Bjorn.Munch:2893)

[Bjorn Munch]

#At file:///home/bm136801/my/merge-tr/ based on revid:bjorn.munch@stripped

 2893 Bjorn Munch	2009-10-19 [merge]
      merge 48130 and 48133 from 5.1

    modified:
      mysql-test/lib/mtr_report.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2009-09-03 06:19:54 +0000
+++ b/mysql-test/lib/mtr_report.pm	2009-10-17 16:34:56 +0000
@@ -146,6 +146,7 @@ sub mtr_report_test ($) {
           }
         }
         $fail = "exp-fail";
+        $tinfo->{exp_fail}= 1;
         last;
       }
     }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-10-16 09:02:37 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-10-19 13:12:16 +0000
@@ -519,7 +519,8 @@ sub run_test_server ($$$) {
 	      }
 	    }
 	    $num_saved_datadir++;
-	    $num_failed_test++ unless $result->{retries};
+	    $num_failed_test++ unless ($result->{retries} ||
+                                       $result->{exp_fail});
 
 	    if ( !$opt_force ) {
 	      # Test has failed, force is off
@@ -4709,7 +4710,8 @@ sub start_servers($) {
       my $logfile= $mysqld->value('#log-error');
       if ( defined $logfile and -f $logfile )
       {
-	$tinfo->{logfile}= mtr_fromfile($logfile);
+        my @srv_lines= extract_server_log($logfile, $tinfo->{name});
+	$tinfo->{logfile}= "Server log is:\n" . join ("", @srv_lines);
       }
       else
       {


Attachment: [text/bzr-bundle] bzr/[e-mail]