[Commits] cb01fe5: the mysql-test combination is 'innodb' not 'xtradb'

serg at mariadb.org serg at mariadb.org
Tue Oct 18 17:46:59 EEST 2016


revision-id: cb01fe594cc7627c44f5c79ba379155c07a965ea (mariadb-10.2.2-63-gcb01fe5)
parent(s): a6758bbf172d8e4076256cc64df38adecaf977c4
author: Sergei Golubchik
committer: Sergei Golubchik
timestamp: 2016-10-18 16:46:53 +0200
message:

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

---
 mysql-test/include/have_innodb.combinations | 14 ++++++++++++++
 mysql-test/suite.pm                         |  7 ++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations
index 49ae741..e893da0 100644
--- a/mysql-test/include/have_innodb.combinations
+++ b/mysql-test/include/have_innodb.combinations
@@ -43,3 +43,17 @@ innodb-buffer-page-lru
 innodb-sys-foreign
 innodb-sys-foreign-cols
 innodb-sys-tables
+
+[innodb]
+innodb
+innodb-cmpmem
+innodb-cmp-per-index
+innodb-trx
+innodb-locks
+innodb-metrics
+innodb-buffer-pool-stats
+innodb-buffer-page
+innodb-buffer-page-lru
+innodb-sys-foreign
+innodb-sys-foreign-cols
+innodb-sys-tables
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index cc73563..f501e61 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}


More information about the commits mailing list