database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

the mysql-test combination is 'innodb' not 'xtradb'

Browse Source
This commit is contained in:
Sergei Golubchik
2016-10-18 16:46:53 +02:00
parent e336fc07bd
commit b8dfedd747
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite.pm
View File

@ -9,9 +9,10 @@ sub skip_combinations {
# disable innodb/xtradb combinatons for configurations that were not built
push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO};
# if something is compiled in, it's xtradb. innodb is MODULE_ONLY:
push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON";
push @combinations, 'innodb';
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';
# XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server
push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO}