diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-05-29 13:04:02 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-05-29 13:04:02 +0200 |
| commit | cf6aeea48ceb32d0f67eaecaeefb5f33568de8fc (patch) | |
| tree | e3b58b555dafa4e196c711fe27f096882e38438a /mysql-test/lib | |
| parent | 4404b6a915a96104c327118cc6fafb43b59d9b96 (diff) | |
| parent | 67bbc74853dcca3864f3d82330d5ee9983ec4b45 (diff) | |
| download | mariadb-git-cf6aeea48ceb32d0f67eaecaeefb5f33568de8fc.tar.gz | |
merge from 5.1 main
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 5a1946687a8..2a7b07debd0 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -898,7 +898,8 @@ sub collect_one_test_case { if ( $tinfo->{'innodb_test'} ) { # This is a test that need innodb - if ( $::mysqld_variables{'innodb'} ne "TRUE" ) + if ( $::mysqld_variables{'innodb'} eq "OFF" || + ! exists $::mysqld_variables{'innodb'} ) { # innodb is not supported, skip it $tinfo->{'skip'}= 1; |