diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
commit | 04647611260a77041186ace12f96b05d50bed4da (patch) | |
tree | 3f8efa00ae2fa2bc6be5165658c34c79c9437a3f /mysql-test/lib | |
parent | dc6bc85cd29586631d927036451d955c7013206c (diff) | |
parent | e835cc851e389770219a33037af65db8887cc9a8 (diff) | |
download | mariadb-git-04647611260a77041186ace12f96b05d50bed4da.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/lib')
-rw-r--r-- | mysql-test/lib/My/Options.pm | 22 | ||||
-rw-r--r-- | mysql-test/lib/mtr_cases.pm | 6 |
2 files changed, 11 insertions, 17 deletions
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index 6e0efe862e7..5827e0666a6 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -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; } diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 97fbdcae838..fe4f316c31f 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -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; |