database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge 48130 and 48133

Browse Source
This commit is contained in:
Bjorn Munch
2009-10-19 15:33:34 +02:00
parent 6c9cb9ba22 6c68019899
commit a47a167492
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/lib/mtr_report.pm
View File

@ -146,6 +146,7 @@ sub mtr_report_test ($) {
} }
} }
$fail = "exp-fail"; $fail = "exp-fail";
$tinfo->{exp_fail}= 1;
last; last;
} }
} }

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

@ -520,7 +520,8 @@ sub run_test_server ($$$) {
} }
} }
$num_saved_datadir++; $num_saved_datadir++;
$num_failed_test++ unless $result->{retries}; $num_failed_test++ unless ($result->{retries} ||
$result->{exp_fail});
if ( !$opt_force ) { if ( !$opt_force ) {
# Test has failed, force is off # Test has failed, force is off
@ -4708,7 +4709,8 @@ sub start_servers($) {
my $logfile= $mysqld->value('#log-error'); my $logfile= $mysqld->value('#log-error');
if ( defined $logfile and -f $logfile ) 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 else
{ {