summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/Options.pm
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
commit9b4a179d69a1c795bef303a88f9d3195669f00ec (patch)
tree87811d81af231e2945468ead0cba58cfc5514548 /mysql-test/lib/My/Options.pm
parent020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff)
parent7db489fc7dea2b4c236807035e57f169074c6682 (diff)
downloadmariadb-git-10.3-merge.tar.gz
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'mysql-test/lib/My/Options.pm')
-rw-r--r--mysql-test/lib/My/Options.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
index 5827e0666a6..b3ae64cb4c2 100644
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@@ -142,11 +142,11 @@ sub diff {
sub is_subset {
my ($set, $subset)= @_;
- my %cache = map { _split_option($_) } @$set;
+ my %cache = map { join('=', _split_option($_)), 1 } @$set;
for (@$subset){
my ($name, $value)= _split_option($_);
- return 0 unless exists $cache{$name} and $cache{$name} eq $value;
+ return 0 unless $cache{"$name=$value"};
}
return 1;