diff options
Diffstat (limited to 'mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result')
-rw-r--r-- | mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result index ee57ab00455..b0eab6dc214 100644 --- a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result @@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, `c2` bit(1) NOT NULL, `c3` bit(1) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -21,7 +21,7 @@ t1 CREATE TABLE `t1` ( `c2` bit(1) NOT NULL, `c3` bit(1) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -35,7 +35,7 @@ t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, `c2` tinyint(4) NOT NULL, `c3` tinyint(4) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -47,7 +47,7 @@ t1 CREATE TABLE `t1` ( `c2` tinyint(4) NOT NULL, `c3` tinyint(4) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -61,7 +61,7 @@ t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, `c2` smallint(6) NOT NULL, `c3` smallint(6) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -73,7 +73,7 @@ t1 CREATE TABLE `t1` ( `c2` smallint(6) NOT NULL, `c3` smallint(6) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -87,7 +87,7 @@ t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, `c2` mediumint(9) NOT NULL, `c3` mediumint(9) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `c2` mediumint(9) NOT NULL, `c3` mediumint(9) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -113,7 +113,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -125,7 +125,7 @@ t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -139,7 +139,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -151,7 +151,7 @@ t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -165,7 +165,7 @@ t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `c2` bigint(20) NOT NULL, `c3` bigint(20) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -177,7 +177,7 @@ t1 CREATE TABLE `t1` ( `c2` bigint(20) NOT NULL, `c3` bigint(20) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -191,7 +191,7 @@ t1 CREATE TABLE `t1` ( `c1` double NOT NULL, `c2` double NOT NULL, `c3` double NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -203,7 +203,7 @@ t1 CREATE TABLE `t1` ( `c2` double NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -217,7 +217,7 @@ t1 CREATE TABLE `t1` ( `c1` double NOT NULL, `c2` double NOT NULL, `c3` double NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -229,7 +229,7 @@ t1 CREATE TABLE `t1` ( `c2` double NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -243,7 +243,7 @@ t1 CREATE TABLE `t1` ( `c1` float NOT NULL, `c2` float NOT NULL, `c3` float NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -255,7 +255,7 @@ t1 CREATE TABLE `t1` ( `c2` float NOT NULL, `c3` float NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -269,7 +269,7 @@ t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` decimal(10,0) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -281,7 +281,7 @@ t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -295,7 +295,7 @@ t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` decimal(10,0) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -307,7 +307,7 @@ t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -321,7 +321,7 @@ t1 CREATE TABLE `t1` ( `c1` date NOT NULL, `c2` date NOT NULL, `c3` date NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -333,7 +333,7 @@ t1 CREATE TABLE `t1` ( `c2` date NOT NULL, `c3` date NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -347,7 +347,7 @@ t1 CREATE TABLE `t1` ( `c1` time NOT NULL, `c2` time NOT NULL, `c3` time NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -359,7 +359,7 @@ t1 CREATE TABLE `t1` ( `c2` time NOT NULL, `c3` time NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -373,7 +373,7 @@ t1 CREATE TABLE `t1` ( `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -385,7 +385,7 @@ t1 CREATE TABLE `t1` ( `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test @@ -399,7 +399,7 @@ t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, `c2` year(4) NOT NULL, `c3` year(4) NOT NULL -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; Tables_in_test @@ -411,7 +411,7 @@ t1 CREATE TABLE `t1` ( `c2` year(4) NOT NULL, `c3` year(4) NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) -) ENGINE=ENGINE DEFAULT CHARSET=latin1 +) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; Tables_in_test |