database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Scripts: use InnoDB in tests, XtraDB disabled

Browse Source
This commit is contained in:
Aleksey Midenkov
2016-09-26 05:55:13 +00:00
parent 7deb6cb39e
commit 002a1bd076
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite.pm
View File

@@ -7,16 +7,15 @@ sub skip_combinations {
my @combinations;
# disable innodb/xtradb combinatons for configurations that were not built
push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO};
push @combinations, 'innodb_plugin'; # unless $ENV{HA_INNODB_SO};
push @combinations, qw(xtradb innodb) unless $::mysqld_variables{'innodb'} eq "ON";
# unconditionally, for now in 10.2. Later it could check for xtradb I_S plugins
push @combinations, 'xtradb';
# if something is compiled in, it's xtradb. innodb is MODULE_ONLY:
push @combinations, 'xtradb'; # unless $::mysqld_variables{'innodb'} eq "ON";
# push @combinations, 'innodb';
# XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server
push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO}
or $::opt_embedded_server;
push @combinations, 'xtradb_plugin'; # if not $ENV{HA_XTRADB_SO}
# or $::opt_embedded_server;
my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
'include/have_xtradb.combinations' => [ @combinations ]);