1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-25 17:25:02 +03:00

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2021-06-21 14:22:22 +03:00
86 changed files with 791 additions and 631 deletions

View File

@@ -80,8 +80,6 @@ sub skip_combinations {
$skip{'main/ssl_verify_ip.test'} = 'x509v3 support required'
unless $openssl_ver ge "1.0.2";
$skip{'main/tls_version1.test'} = 'https://github.com/wolfSSL/wolfssl/issues/2960'
if $ssl_lib =~ /WolfSSL 4.4.0/;
%skip;
}