diff options
| author | unknown <mleich@three.local.lan> | 2006-09-18 16:55:56 +0200 |
|---|---|---|
| committer | unknown <mleich@three.local.lan> | 2006-09-18 16:55:56 +0200 |
| commit | 754fcca98af976115d760be28994d63c6845563b (patch) | |
| tree | 0ac38a56bc28c67ffdd82eb847cd53f419c598da /mysql-test/t/index_merge_innodb.test | |
| parent | 01e2f11f18352b9b5a2a11fb6dcb9ec17b03366a (diff) | |
| download | mariadb-git-754fcca98af976115d760be28994d63c6845563b.tar.gz | |
1. Cumulated fix for Bug#22398, #22404 and #22405
2. Correct some logical bugs within the tests, which were caused by
automatic resolve of BitKeeper
mysql-test/include/mix1.inc:
- Remove hardcoded assignment of storage engine, because this violates the logics of
refactored tests
- Remove trailing spaces
- Move the FOREIGN KEY creation(probably not really needed for the testcase) out of
the CREATE TABLE statement + let the FK creation depend on the storage engine capabilities
mysql-test/r/index_merge_innodb.result:
Updated result
mysql-test/r/index_merge_myisam.result:
Updated result
mysql-test/r/innodb_mysql.result:
Updated result
mysql-test/t/disabled.def:
Reenable the fixed tests
mysql-test/t/index_merge_innodb.test:
Important comment describing how to modify the tests when some issues
(most probably no bugs) are fixed.
mysql-test/t/innodb_mysql.test:
Introduction of a variable for switching FOREIGN KEY on/off
Diffstat (limited to 'mysql-test/t/index_merge_innodb.test')
| -rw-r--r-- | mysql-test/t/index_merge_innodb.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test index 509ad733578..a3bda0ad00c 100644 --- a/mysql-test/t/index_merge_innodb.test +++ b/mysql-test/t/index_merge_innodb.test @@ -15,7 +15,11 @@ let $engine_type= InnoDB; # InnoDB does not support Merge tables (affects include/index_merge1.inc) let $merge_table_support= 0; -# Tests disabled because of open Bug#21277 and non deterministic explain output. +# The first two tests are disabled because of non deterministic explain output. +# If include/index_merge1.inc can be enabled for InnoDB and all other +# storage engines, please remove the subtest for Bug#21277 from +# include/index_merge2.inc. +# This test exists already in include/index_merge1.inc. # --source include/index_merge1.inc # --source include/index_merge_ror.inc |