mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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.
This commit is contained in:
@ -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' ];
|
||||
|
Reference in New Issue
Block a user