database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 11.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite.pm
View File

@@ -18,7 +18,7 @@ sub skip_combinations {
$skip{'include/platform.combinations'} = [ 'aix', 'win' ];
}
if ( $::opt_ps_protocol ) {
if ( $::opt_ps_protocol || $::opt_cursor_protocol) {
$skip{'include/protocol.combinations'} = [ 'nm' ];
} else {
$skip{'include/protocol.combinations'} = [ 'ps' ];
@@ -74,6 +74,8 @@ sub skip_combinations {
$skip{'main/openssl_6975.test'} = 'no or wrong openssl version'
unless $openssl_ver ge "1.0.1d" and $openssl_ver lt "1.1.1";
$skip{'main/func_kdf.combinations'} = [ $ssl_lib =~ /OpenSSL 1\.0\./ ? 'new' : 'old' ];
$skip{'main/tlsv13.test'} = 'does not work with OpenSSL <= 1.1.1'
unless $ssl_lib =~ /WolfSSL/ or $openssl_ver ge "3.0.0";
sub utf8_command_line_ok() {
if (IS_WINDOWS) {