diff options
Diffstat (limited to 'mysql-test/suite/innodb/r/index_merge_threshold.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/index_merge_threshold.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/r/index_merge_threshold.result b/mysql-test/suite/innodb/r/index_merge_threshold.result index 35cb82e6f1e..989d31e90b1 100644 --- a/mysql-test/suite/innodb/r/index_merge_threshold.result +++ b/mysql-test/suite/innodb/r/index_merge_threshold.result @@ -48,7 +48,7 @@ tab CREATE TABLE `tab` ( KEY `index5` (`c5`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=30', KEY `index6` (`c6`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=35', KEY `index7` (`c7`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=40' -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT t.NAME as TABLE_NAME, i.NAME as INDEX_NAME, i.MERGE_THRESHOLD FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES t, INFORMATION_SCHEMA.INNODB_SYS_INDEXES i WHERE t.TABLE_ID = i.TABLE_ID AND t.NAME = 'test/tab'; @@ -84,7 +84,7 @@ tab CREATE TABLE `tab` ( KEY `index5` (`c5`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=30', KEY `index6` (`c6`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=35', KEY `index7` (`c7`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=40' -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='MERGE_THRESHOLD=49' +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='MERGE_THRESHOLD=49' SELECT t.NAME as TABLE_NAME, i.NAME as INDEX_NAME, i.MERGE_THRESHOLD FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES t, INFORMATION_SCHEMA.INNODB_SYS_INDEXES i WHERE t.TABLE_ID = i.TABLE_ID AND t.NAME = 'test/tab'; @@ -120,7 +120,7 @@ tab CREATE TABLE `tab` ( KEY `index5` (`c5`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=30', KEY `index6` (`c6`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=35', KEY `index7` (`c7`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=40' -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='MERGE_THRESHOLD=49' +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='MERGE_THRESHOLD=49' SELECT t.NAME as TABLE_NAME, i.NAME as INDEX_NAME, i.MERGE_THRESHOLD FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES t, INFORMATION_SCHEMA.INNODB_SYS_INDEXES i WHERE t.TABLE_ID = i.TABLE_ID AND t.NAME = 'test/tab'; @@ -158,7 +158,7 @@ tab CREATE TABLE `tab` ( KEY `index6` (`c6`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=35', KEY `index7` (`c7`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=40', KEY `index8` (`c7`(750)) COMMENT 'Check index level merge MERGE_THRESHOLD=45' -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='MERGE_THRESHOLD=49' +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='MERGE_THRESHOLD=49' SELECT t.NAME as TABLE_NAME, i.NAME as INDEX_NAME, i.MERGE_THRESHOLD FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES t, INFORMATION_SCHEMA.INNODB_SYS_INDEXES i WHERE t.TABLE_ID = i.TABLE_ID AND t.NAME = 'test/tab'; |