diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:18:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:18:48 +0100 |
| commit | 3cda92aece63a1d1d7f0f37e0e6c2535d2022e62 (patch) | |
| tree | b7b2acac705f599527734636f1221d06f67a0d99 /mysql-test/suite.pm | |
| parent | a19a4618e3c569afea08d5fe02ea3da2426415d6 (diff) | |
| download | mariadb-git-3cda92aece63a1d1d7f0f37e0e6c2535d2022e62.tar.gz | |
don't even try to run xtradb-only tests with innodb, use have_xtradb.combinations.
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index fc9d724a6e0..9db2c96a7c5 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -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 { }; |