5.5 merge

2025-07-30 16:24:05 +03:00 · 2014-11-20 16:27:16 +01:00
parent 3c12c27907 48f4961a12
commit dbbe365132
8 changed files with 6 additions and 4 deletions
--- a/mysql-test/r/openssl-poodle_6975,sslv3.result
+++ b/mysql-test/r/openssl-poodle_6975,sslv3.result
--- a/mysql-test/r/openssl-poodle_6975,tlsv12.result
+++ b/mysql-test/r/openssl-poodle_6975,tlsv12.result
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@ -52,7 +52,7 @@ sub skip_combinations {
  }
  $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();

-  $skip{'t/openssl-poodle_6975.test'} = 'no or too old openssl'
+  $skip{'t/openssl_6975.test'} = 'no or too old openssl'
    unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null";

  %skip;
--- a/mysql-test/t/openssl-poodle_6975.combinations
+++ b/mysql-test/t/openssl-poodle_6975.combinations
@ -1,6 +1,6 @@
 [tlsv12]
 loose-ssl-cipher=TLSv1.2

-[sslv3]
+[tlsv10]
 loose-ssl-cipher=SSLv3

--- a/mysql-test/t/openssl-poodle_6975.test
+++ b/mysql-test/t/openssl-poodle_6975.test