make sysvars_* tests to work on 32-bit too

1 files changed, 10 insertions, 0 deletions

diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index d80b4aaf822..7f7f1f599a1 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -23,6 +23,16 @@ sub skip_combinations {
   # don't run tests for the wrong platform
   $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
 
+  # and for the wrong word size
+  # check for exact values, in case the default changes to be small everywhere
+  my $longsysvar= $::mysqld_variables{'max-binlog-stmt-cache-size'};
+  my %val_map= (
+    '4294963200' => '64bit', # remember, it shows *what configuration to skip*
+    '18446744073709547520' => '32bit'
+  );
+  die "unknown value max-binlog-stmt-cache-size=$longsysvar" unless $val_map{$longsysvar};
+  $skip{'include/word_size.combinations'} = [ $val_map{$longsysvar} ];
+
   # as a special case, disable certain include files as a whole
   $skip{'include/not_embedded.inc'} = 'Not run for embedded server'
              if $::opt_embedded_server;