diff options
Diffstat (limited to 'mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result')
-rw-r--r-- | mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result index c642d7d1767..37a0b81fb70 100644 --- a/mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result @@ -10,7 +10,7 @@ t1 CREATE TABLE `t1` ( `c2` char(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -23,7 +23,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -38,7 +38,7 @@ t1 CREATE TABLE `t1` ( `c2` char(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -51,7 +51,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -66,7 +66,7 @@ t1 CREATE TABLE `t1` ( `c2` char(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -79,7 +79,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -94,7 +94,7 @@ t1 CREATE TABLE `t1` ( `c2` char(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -107,7 +107,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -122,7 +122,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -135,7 +135,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -150,7 +150,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -163,7 +163,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -178,7 +178,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -191,7 +191,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -206,7 +206,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -219,7 +219,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( `c2` binary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -247,7 +247,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -262,7 +262,7 @@ t1 CREATE TABLE `t1` ( `c2` binary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -275,7 +275,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -290,7 +290,7 @@ t1 CREATE TABLE `t1` ( `c2` binary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -303,7 +303,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -318,7 +318,7 @@ t1 CREATE TABLE `t1` ( `c2` binary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -331,7 +331,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -346,7 +346,7 @@ t1 CREATE TABLE `t1` ( `c2` varbinary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -359,7 +359,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -374,7 +374,7 @@ t1 CREATE TABLE `t1` ( `c2` varbinary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -387,7 +387,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -402,7 +402,7 @@ t1 CREATE TABLE `t1` ( `c2` varbinary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -415,7 +415,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -430,7 +430,7 @@ t1 CREATE TABLE `t1` ( `c2` varbinary(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; Tables_in_test @@ -443,7 +443,7 @@ t1 CREATE TABLE `t1` ( `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test |