Merge branch '10.5' into 10.6

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;