summaryrefslogtreecommitdiff
path: root/mysql-test/suite.pm
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r--mysql-test/suite.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index d0a4b618aaa..23c07958841 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -19,6 +19,9 @@ sub skip_combinations {
# don't run tests for the wrong platform
$skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
+ $skip{'include/maybe_debug.combinations'} =
+ [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
+
# 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'};
@@ -29,9 +32,6 @@ sub skip_combinations {
die "unknown value max-binlog-stmt-cache-size=$longsysvar" unless $val_map{$longsysvar};
$skip{'include/word_size.combinations'} = [ $val_map{$longsysvar} ];
- $skip{'include/maybe_debug.combinations'} =
- [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
-
# 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;