diff options
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_bug51378.result')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug51378.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug51378.result b/mysql-test/suite/innodb/r/innodb_bug51378.result index 2ffd533279b..7d2c869b33b 100644 --- a/mysql-test/suite/innodb/r/innodb_bug51378.result +++ b/mysql-test/suite/innodb/r/innodb_bug51378.result @@ -16,7 +16,7 @@ bug51378 CREATE TABLE `bug51378` ( UNIQUE KEY `idx3` (`col1`,`col3`), UNIQUE KEY `idx` (`col1`,`col2`(31)), UNIQUE KEY `idx2` (`col1`,`col2`(31)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop index idx3 on bug51378; SHOW CREATE TABLE bug51378; Table Create Table @@ -26,7 +26,7 @@ bug51378 CREATE TABLE `bug51378` ( `col3` time NOT NULL, UNIQUE KEY `idx` (`col1`,`col2`(31)), UNIQUE KEY `idx2` (`col1`,`col2`(31)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table bug51378 add primary key idx3(col1, col2(31)); Warnings: Warning 1280 Name 'idx3' ignored for PRIMARY key. @@ -39,7 +39,7 @@ bug51378 CREATE TABLE `bug51378` ( PRIMARY KEY (`col1`,`col2`(31)), UNIQUE KEY `idx` (`col1`,`col2`(31)), UNIQUE KEY `idx2` (`col1`,`col2`(31)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table bug51378; create table bug51378 ( col1 int not null, @@ -54,7 +54,7 @@ bug51378 CREATE TABLE `bug51378` ( `col3` time NOT NULL, PRIMARY KEY (`col1`,`col2`(31)), UNIQUE KEY `idx` (`col1`,`col2`(31)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table bug51378; create table bug51378 ( col1 int not null, @@ -66,5 +66,5 @@ bug51378 CREATE TABLE `bug51378` ( `col1` int(11) NOT NULL, `col2` int(11) DEFAULT NULL, UNIQUE KEY `idx` (`col1`,`col2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table bug51378; |