diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-07 15:21:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-07 15:21:07 +0100 |
| commit | a5fdd75980016639351971ae2d7e02ee60c10e0d (patch) | |
| tree | fe4cc7190f3bc002baf3ff8aa620984ff6ff88b1 /mysql-test/suite.pm | |
| parent | fd25574645662c14e76e05690eb1be158a800370 (diff) | |
| download | mariadb-git-a5fdd75980016639351971ae2d7e02ee60c10e0d.tar.gz | |
XtraDB made the default
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 6b1d3b7158b..d80b4aaf822 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -9,9 +9,9 @@ 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 innodb. xtradb is MODULE_ONLY: - push @combinations, 'innodb' unless $::mysqld_variables{'innodb'} eq "ON"; - 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} |