mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	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
		
	
		
			
				
	
	
		
			29 lines
		
	
	
		
			997 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			29 lines
		
	
	
		
			997 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # t/index_merge_innodb.test
 | |
| #
 | |
| # Index merge tests
 | |
| #
 | |
| # Last update:
 | |
| # 2006-08-07 ML test refactored (MySQL 5.1)
 | |
| #               Main code of several index_merge tests
 | |
| #                            -> include/index_merge*.inc
 | |
| #               wrapper t/index_merge_innodb.test sources now several 
 | |
| #               include/index_merge*.inc files
 | |
| #
 | |
| 
 | |
| --source include/have_innodb.inc
 | |
| let $engine_type= InnoDB;
 | |
| # InnoDB does not support Merge tables (affects include/index_merge1.inc)
 | |
| let $merge_table_support= 0;
 | |
| 
 | |
| # 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
 | |
| 
 | |
| --source include/index_merge2.inc
 | |
| --source include/index_merge_2sweeps.inc
 | |
| --source include/index_merge_ror_cpk.inc
 |