1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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
This commit is contained in:
unknown
2006-09-18 16:55:56 +02:00
parent 01e2f11f18
commit 754fcca98a
7 changed files with 127 additions and 17 deletions

View File

@@ -8,5 +8,7 @@
-- source include/have_innodb.inc
let $engine_type= InnoDB;
let $other_engine_type= MEMORY;
# InnoDB does support FOREIGN KEYFOREIGN KEYs
let $test_foreign_keys= 1;
--source include/mix1.inc