mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2021-08-31 11:00:41 +03:00
commit e94172c2a0
22 changed files with 106 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mysql-test/lib/My/Options.pm
View file

@ -140,24 +140,16 @@ sub diff {
}
sub is_set {
my ($opts, $set_opts)= @_;
sub is_subset {
my ($set, $subset)= @_;
my %cache = map { _split_option($_) } @$set;
foreach my $opt (@$opts){
my ($opt_name1, $value1)= _split_option($opt);
foreach my $set_opt (@$set_opts){
my ($opt_name2, $value2)= _split_option($set_opt);
if ($opt_name1 eq $opt_name2 and $value1 eq $value2){
# Option already set
return 1;
}
}
for (@$subset){
my ($name, $value)= _split_option($_);
return 0 unless exists $cache{$name} and $cache{$name} eq $value;
}
return 0;
return 1;
}

6
mysql-test/lib/mtr_cases.pm
View file

@ -626,8 +626,10 @@ sub make_combinations($$@)
{
# Skip all other combinations if the values they change
# are already fixed in master_opt or slave_opt
if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) &&
My::Options::is_set($test->{slave_opt}, $comb->{comb_opt}) ){
# (empty combinations are not considered a subset of anything)
if (@{$comb->{comb_opt}} &&
My::Options::is_subset($test->{master_opt}, $comb->{comb_opt}) &&
My::Options::is_subset($test->{slave_opt}, $comb->{comb_opt}) ){
$test_combs->{$comb->{name}} = 2;