database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

don't even try to run xtradb-only tests with innodb, use have_xtradb.combinations.

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-23 09:18:48 +01:00
parent a19a4618e3
commit 3cda92aece
14 changed files with 34 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite.pm
View File

@ -10,7 +10,8 @@ sub skip_combinations {
push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO};
push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON";
my %skip = ( 'include/have_innodb.combinations' => [ @combinations ]);
my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
'include/have_xtradb.combinations' => [ @combinations ]);
# as a special case, disable certain include files as a whole
$skip{'include/not_embedded.inc'} = 'Not run for embedded server'
@ -30,6 +31,5 @@ sub skip_combinations {
%skip;
}
bless { };