database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-04-21 11:58:32 +03:00
parent 0c02c91bc1 3d1ad2a5e8
commit ea94717983
17 changed files with 140 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite.pm
View File

@ -21,6 +21,9 @@ sub skip_combinations {
my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
'include/have_xtradb.combinations' => [ @combinations ]);
$skip{'include/innodb_encrypt_log.combinations'} = [ 'crypt' ]
unless $ENV{DEBUG_KEY_MANAGEMENT_SO};
# don't run tests for the wrong platform
$skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];