diff options
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 5100b4137a2..4cc6b410fa1 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -25,6 +25,12 @@ sub skip_combinations { $skip{'include/platform.combinations'} = [ 'aix', 'win' ]; } + if ( $::opt_ps_protocol ) { + $skip{'include/protocol.combinations'} = [ 'nm' ]; + } else { + $skip{'include/protocol.combinations'} = [ 'ps' ]; + } + $skip{'include/maybe_debug.combinations'} = [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ]; |