diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
| commit | a903be5d964fcda2c7f6eb649885dbd98901fb72 (patch) | |
| tree | c4714d265a82b3c7aef7188853b439d8d54b8bf5 /mysql-test/suite.pm | |
| parent | 1f63feb91a027cdccbf3c14d513d11acf8aa7431 (diff) | |
| parent | 6935d66053b2c9723314d89d5169dcf34ed56c08 (diff) | |
| download | mariadb-git-10.2-wlad-merge.tar.gz | |
Merge commit '6935d66053b2c9723314d89d5169dcf34ed56c08' into bb-10.2-marko10.2-wlad-merge
# Conflicts:
# debian/control
# debian/mariadb-server-10.2.install
# include/my_sys.h
# mysql-test/collections/buildbot_suites.bat
# plugin/auth_dialog/CMakeLists.txt
# sql/CMakeLists.txt
# sql/sql_class.cc
# storage/innobase/CMakeLists.txt
# storage/innobase/log/log0crypt.cc
# win/packaging/CPackWixConfig.cmake
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index f501e610e53..a662a600afe 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -68,6 +68,10 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1d"; + $skip{'t/ssl_7937.combinations'} = [ 'x509v3' ] + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.2"; + %skip; } |