diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
| commit | 75689af808d935de69a39138e35cde575c982251 (patch) | |
| tree | c2668ecbca1fc441f2a39eb25cbb54f16181414a /mysql-test/include/have_innodb.inc | |
| parent | 3955e94c34d638df24c5d640558a5aee14342603 (diff) | |
| parent | 54c531607df9b14f206fa8a44f39f2764f55ac82 (diff) | |
| download | mariadb-git-75689af808d935de69a39138e35cde575c982251.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
Auto merged
Diffstat (limited to 'mysql-test/include/have_innodb.inc')
| -rw-r--r-- | mysql-test/include/have_innodb.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc index be8850725e5..cbffe6a2574 100644 --- a/mysql-test/include/have_innodb.inc +++ b/mysql-test/include/have_innodb.inc @@ -1,4 +1,4 @@ disable_query_log; --require r/true.require -select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb'; +select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'innodb'; enable_query_log; |