diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:10:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:10:47 +0100 |
| commit | 0562261336e1384e00f3c5e10f70096a5789600d (patch) | |
| tree | 2a3b7ee7933b4efec2ba3d3aa68d3e53feaa5820 /mysql-test/suite.pm | |
| parent | 8e72ddbb9cd2a817f816bed86f7dc9d7c08eb156 (diff) | |
| download | mariadb-git-0562261336e1384e00f3c5e10f70096a5789600d.tar.gz | |
mysql-test:
* rename "xtradb" combination to be called "innodb"
* disable xtradb_plugin embedded tests (because of RECOMPILE_FOR_EMBEDDED)
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 3dbacc7f8fc..7f676b7ccfd 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -8,8 +8,14 @@ sub skip_combinations { # disable innodb/xtradb combinatons for configurations that were not built push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO}; - push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO}; - push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON"; + + # if something is compiled in, it's innodb. xtradb is MODULE_ONLY: + push @combinations, 'innodb' unless $::mysqld_variables{'innodb'} eq "ON"; + 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} + or $::opt_embedded_server; my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], 'include/have_xtradb.combinations' => [ @combinations ]); |