diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-18 16:46:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-12 20:27:20 +0100 |
| commit | b8dfedd7473c233bbb3c6fdb604a458529430904 (patch) | |
| tree | 4c9322bd457f84b94bc8ca9730f22596bfcff291 /mysql-test/suite.pm | |
| parent | e336fc07bdd4e81b7bf085e323610d7e251d542c (diff) | |
| download | mariadb-git-b8dfedd7473c233bbb3c6fdb604a458529430904.tar.gz | |
the mysql-test combination is 'innodb' not 'xtradb'
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index cc735638be9..f501e610e53 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -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} |