diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
| commit | c764bc0a78e9359fa208e074bd327f7a852c7cb7 (patch) | |
| tree | eeb5d56d225d1fdf97a016c3eae7b93c4e1f6927 /mysql-test/suite.pm | |
| parent | d702e463902bca7d94ff8a1a49468a5b7bdb4ba0 (diff) | |
| parent | 15795b9f9a850d9587f17ef18e1ac7b5af31ec1e (diff) | |
| download | mariadb-git-c764bc0a78e9359fa208e074bd327f7a852c7cb7.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index a662a600afe..c1ebf254dad 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -34,6 +34,9 @@ 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; |