mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
merge 48130 and 48133
This commit is contained in:
commit
2f36bc160a
2 changed files with 5 additions and 2 deletions
mysql-test
|
@ -146,6 +146,7 @@ sub mtr_report_test ($) {
|
|||
}
|
||||
}
|
||||
$fail = "exp-fail";
|
||||
$tinfo->{exp_fail}= 1;
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -520,7 +520,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
|
||||
|
@ -4708,7 +4709,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
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue