From 83c0866082cd630cada815add97bbf2d09ac8ab3 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 9 Jan 2015 14:00:00 +0100 Subject: new read-only server variable version_ssl_library --- mysql-test/suite.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mysql-test/suite.pm') 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; } -- cgit v1.2.1