diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-09 14:00:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:16 +0100 |
| commit | 83c0866082cd630cada815add97bbf2d09ac8ab3 (patch) | |
| tree | 55a0e7cbbfb4d90b36648a8f2436336e9f143ddf /mysql-test/suite.pm | |
| parent | 0d676fa0b745257673e0f986472209d313aa4dae (diff) | |
| download | mariadb-git-83c0866082cd630cada815add97bbf2d09ac8ab3.tar.gz | |
new read-only server variable version_ssl_library
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index ffb34f5a8cf..b063f32c506 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -63,7 +63,8 @@ sub skip_combinations { $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); $skip{'t/openssl_6975.test'} = 'no or too old openssl' - unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 >/dev/null 2>&1"; + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.1"; %skip; } |