diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-21 13:44:16 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-21 13:44:16 +0300 |
commit | 2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a (patch) | |
tree | 0d00d4685c60baa325d12d5103fbf72253682bbc /mysql-test/suite.pm | |
parent | 99e017d09945d04e8f43d3b74ecc556e809613a2 (diff) | |
download | mariadb-git-2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a.tar.gz |
Remove XtraDB
The XtraDB storage engine was already replaced by InnoDB
and disabled in MariaDB Server 10.2. Let us remove it altogether
to avoid dragging dead code around.
Replace some references to XtraDB with references to InnoDB.
rpl_get_position_info(): Remove.
Remove the mysql-test-run --suite=percona, because it only contains
tests specific to XtraDB, many of which were disabled already in
earlier MariaDB versions.
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r-- | mysql-test/suite.pm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index a662a600afe..c8201b0a554 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -6,20 +6,12 @@ use My::Platform; sub skip_combinations { my @combinations; - # disable innodb/xtradb combinatons for configurations that were not built + # disable innodb combinations for configurations that were not built push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO}; - push @combinations, qw(xtradb innodb) unless $::mysqld_variables{'innodb'} eq "ON"; + push @combinations, '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} - or $::opt_embedded_server; - - my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], - 'include/have_xtradb.combinations' => [ @combinations ]); + my %skip = ( 'include/have_innodb.combinations' => [ @combinations ]); # don't run tests for the wrong platform $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ]; |