mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge with trunk
This commit is contained in:
commit
0e9e201d03
2 changed files with 14 additions and 2 deletions
|
@ -560,8 +560,12 @@ sub collect_one_suite($)
|
|||
sub optimize_cases {
|
||||
my ($cases)= @_;
|
||||
|
||||
my @new_cases= ();
|
||||
|
||||
foreach my $tinfo ( @$cases )
|
||||
{
|
||||
push @new_cases, $tinfo;
|
||||
|
||||
# Skip processing if already marked as skipped
|
||||
next if $tinfo->{skip};
|
||||
|
||||
|
@ -615,6 +619,13 @@ sub optimize_cases {
|
|||
$tinfo->{'skip'}= 1;
|
||||
$tinfo->{'comment'}=
|
||||
"Doesn't support --binlog-format='$test_binlog_format'";
|
||||
# This test was added as a replication combination, but it is not
|
||||
# actually ever possible to run it, as it is not made for this
|
||||
# combination.
|
||||
# So delete it from the list, rather than confuse the user with a
|
||||
# message that this test is skipped (it is not really, just run
|
||||
# with other combinations).
|
||||
pop(@new_cases);
|
||||
next;
|
||||
}
|
||||
}
|
||||
|
@ -683,6 +694,7 @@ sub optimize_cases {
|
|||
}
|
||||
}
|
||||
}
|
||||
@$cases= @new_cases;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -126,13 +126,13 @@ my $path_config_file; # The generated config file, var/my.cnf
|
|||
# executables will be used by the test suite.
|
||||
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
|
||||
|
||||
my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb";
|
||||
my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb";
|
||||
my $opt_suites;
|
||||
|
||||
our $opt_usage;
|
||||
our $opt_list_options;
|
||||
our $opt_suites;
|
||||
our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
|
||||
our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run
|
||||
our $opt_script_debug= 0; # Script debugging, enable with --script-debug
|
||||
our $opt_verbose= 0; # Verbose output, enable with --verbose
|
||||
our $exe_mysql;
|
||||
|
|
Loading…
Reference in a new issue