mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with mysql-maria tree
mysql-test/t/variables.test: Reset delay_key_write, otherwise maria.maria test may fail sql/set_var.cc: Reset ha_open_options if one resets the delay_key_write variable. Before there was no way to reset it without restarting mysqld, which caused some tests to fail
This commit is contained in:
@ -165,18 +165,11 @@ sub mtr_report_test ($) {
|
||||
}
|
||||
elsif ( $comment )
|
||||
{
|
||||
if ( $tinfo->{skip_detected_by_test} )
|
||||
{
|
||||
mtr_report("[ skip ]. $comment");
|
||||
}
|
||||
else
|
||||
{
|
||||
mtr_report("[ skip ] $comment");
|
||||
}
|
||||
mtr_report("[ skipped ] $comment");
|
||||
}
|
||||
else
|
||||
{
|
||||
mtr_report("[ skip ]");
|
||||
mtr_report("[ skipped ]");
|
||||
}
|
||||
}
|
||||
elsif ($result eq 'MTR_RES_PASSED')
|
||||
@ -266,7 +259,6 @@ sub mtr_report_stats ($) {
|
||||
}
|
||||
|
||||
print "\n";
|
||||
|
||||
# Print a list of check_testcases that failed(if any)
|
||||
if ( $::opt_check_testcases )
|
||||
{
|
||||
@ -353,7 +345,7 @@ sub mtr_print_line () {
|
||||
|
||||
sub mtr_print_thick_line {
|
||||
my $char= shift || '=';
|
||||
print $char x 60, "\n";
|
||||
print $char x 78, "\n";
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user