MDEV-29446 Change SHOW CREATE TABLE to display default collation

1 files changed, 74 insertions, 74 deletions

diff --git a/mysql-test/main/null.result b/mysql-test/main/null.result
index 3eb7e143347..ffd709cf741 100644
--- a/mysql-test/main/null.result
+++ b/mysql-test/main/null.result
@@ -236,44 +236,44 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c00` binary(0) DEFAULT NULL,
-  `c01` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c02` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c03` varchar(6) CHARACTER SET latin2 NOT NULL,
-  `c04` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c05` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c06` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c07` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c08` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c09` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c10` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c11` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c12` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c13` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
+  `c01` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c02` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c03` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci NOT NULL,
+  `c04` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c05` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c06` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c07` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c08` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c09` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c10` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c11` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c12` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c13` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
   `c14` binary(0) DEFAULT NULL,
-  `c15` char(0) CHARACTER SET latin2 DEFAULT NULL,
-  `c16` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c17` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c18` char(0) CHARACTER SET latin2 DEFAULT NULL,
-  `c19` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c20` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c21` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c22` varchar(6) CHARACTER SET latin2 DEFAULT NULL,
-  `c23` varchar(9) CHARACTER SET latin2 DEFAULT NULL,
-  `c24` varchar(9) CHARACTER SET latin2 DEFAULT NULL,
-  `c25` varchar(12) CHARACTER SET latin2 DEFAULT NULL,
-  `c26` varchar(7) CHARACTER SET latin2 DEFAULT NULL,
-  `c27` varchar(7) CHARACTER SET latin2 DEFAULT NULL,
-  `c29` varchar(381) CHARACTER SET latin2 DEFAULT NULL,
-  `c30` varchar(317) CHARACTER SET latin2 DEFAULT NULL,
-  `c31` varchar(192) CHARACTER SET latin2 DEFAULT NULL,
-  `c32` char(0) CHARACTER SET latin2 DEFAULT NULL,
-  `c33` varchar(3) CHARACTER SET latin2 DEFAULT NULL,
-  `c34` varchar(3) CHARACTER SET latin2 DEFAULT NULL,
-  `c35` varchar(3) CHARACTER SET latin2 DEFAULT NULL,
-  `c36` varchar(3) CHARACTER SET latin2 DEFAULT NULL,
-  `c37` varchar(10) CHARACTER SET latin2 DEFAULT NULL,
-  `c38` varchar(10) CHARACTER SET latin2 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+  `c15` char(0) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c16` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c17` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c18` char(0) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c19` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c20` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c21` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c22` varchar(6) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c23` varchar(9) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c24` varchar(9) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c25` varchar(12) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c26` varchar(7) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c27` varchar(7) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c29` varchar(381) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c30` varchar(317) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c31` varchar(192) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c32` char(0) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c33` varchar(3) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c34` varchar(3) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c35` varchar(3) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c36` varchar(3) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c37` varchar(10) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
+  `c38` varchar(10) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select 
 case 'str' when 'STR' then 'str' when null then 'null' end as c01,
@@ -310,21 +310,21 @@ bug19145a	CREATE TABLE `bug19145a` (
   `e` enum('a','b','c') DEFAULT NULL,
   `s` set('x','y','z') DEFAULT NULL,
   `i` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 show create table bug19145b;
 Table	Create Table
 bug19145b	CREATE TABLE `bug19145b` (
   `e` enum('a','b','c') DEFAULT NULL,
   `s` set('x','y','z') DEFAULT NULL,
   `i` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 show create table bug19145c;
 Table	Create Table
 bug19145c	CREATE TABLE `bug19145c` (
   `e` enum('a','b','c') NOT NULL DEFAULT 'b',
   `s` set('x','y','z') NOT NULL DEFAULT 'y',
   `i` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table bug19145a;
 drop table bug19145b;
 drop table bug19145c;
@@ -430,7 +430,7 @@ t2	CREATE TABLE `t2` (
   `a` time DEFAULT NULL,
   `NULLIF(a,a)` time DEFAULT NULL,
   `CASE WHEN a=a THEN NULL ELSE a END` time DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1,t2;
 SELECT NULLIF(_latin1'a' COLLATE latin1_general_ci, _latin1'a' COLLATE latin1_bin);
 ERROR HY000: Illegal mix of collations (latin1_general_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'nullif'
@@ -451,7 +451,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(1,1e0)` int(1) DEFAULT NULL,
   `NULLIF(1,'2001-01-01')` int(1) DEFAULT NULL,
   `NULLIF(1,TIME'00:00:00')` int(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 CREATE TABLE t1 AS SELECT
@@ -470,7 +470,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(1.0,1e0)` decimal(2,1) DEFAULT NULL,
   `NULLIF(1.0,'2001-01-01')` decimal(2,1) DEFAULT NULL,
   `NULLIF(1.0,TIME'00:00:00')` decimal(2,1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 CREATE TABLE t1 AS SELECT
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(1e0,1e0)` double DEFAULT NULL,
   `NULLIF(1e0,'2001-01-01')` double DEFAULT NULL,
   `NULLIF(1e0,TIME'00:00:00')` double DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
 NULLIF('1',1),
@@ -505,7 +505,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF('1',1e0)` varchar(1) DEFAULT NULL,
   `NULLIF('1','2001-01-01')` varchar(1) DEFAULT NULL,
   `NULLIF('1',TIME'00:00:00')` varchar(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 CREATE TABLE t1 AS SELECT
@@ -526,7 +526,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(TIMESTAMP'2001-01-01 00:00:00',1e0)` datetime DEFAULT NULL,
   `NULLIF(TIMESTAMP'2001-01-01 00:00:00','2001-01-01')` datetime DEFAULT NULL,
   `NULLIF(TIMESTAMP'2001-01-01 00:00:00',TIME'00:00:00')` datetime DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 CREATE TABLE t1 AS SELECT
@@ -547,7 +547,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(DATE'2001-01-01',1e0)` date DEFAULT NULL,
   `NULLIF(DATE'2001-01-01','2001-01-01')` date DEFAULT NULL,
   `NULLIF(DATE'2001-01-01',TIME'00:00:00')` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
 NULLIF(TIME'00:00:01',1),
@@ -563,7 +563,7 @@ t1	CREATE TABLE `t1` (
   `NULLIF(TIME'00:00:01',1e0)` time DEFAULT NULL,
   `NULLIF(TIME'00:00:01','00:00:00')` time DEFAULT NULL,
   `NULLIF(TIME'00:00:01',DATE'2001-01-01')` time DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1
 (
@@ -629,7 +629,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_tinyint,  c_timestamp3)` tinyint(4) DEFAULT NULL,
   `NULLIF(c_tinyint,  c_date)` tinyint(4) DEFAULT NULL,
   `NULLIF(c_tinyint,  c_time)` tinyint(4) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_smallint,  1),
@@ -668,7 +668,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_smallint,  c_timestamp3)` smallint(6) DEFAULT NULL,
   `NULLIF(c_smallint,  c_date)` smallint(6) DEFAULT NULL,
   `NULLIF(c_smallint,  c_time)` smallint(6) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_int,  1),
@@ -707,7 +707,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_int,  c_timestamp3)` int(11) DEFAULT NULL,
   `NULLIF(c_int,  c_date)` int(11) DEFAULT NULL,
   `NULLIF(c_int,  c_time)` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_bigint,  1),
@@ -746,7 +746,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_bigint,  c_timestamp3)` bigint(20) DEFAULT NULL,
   `NULLIF(c_bigint,  c_date)` bigint(20) DEFAULT NULL,
   `NULLIF(c_bigint,  c_time)` bigint(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_float,  1),
@@ -785,7 +785,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_float,  c_timestamp3)` float DEFAULT NULL,
   `NULLIF(c_float,  c_date)` float DEFAULT NULL,
   `NULLIF(c_float,  c_time)` float DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_double,  1),
@@ -824,7 +824,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_double,  c_timestamp3)` double DEFAULT NULL,
   `NULLIF(c_double,  c_date)` double DEFAULT NULL,
   `NULLIF(c_double,  c_time)` double DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_decimal103,  1),
@@ -863,7 +863,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_decimal103,  c_timestamp3)` decimal(10,3) DEFAULT NULL,
   `NULLIF(c_decimal103,  c_date)` decimal(10,3) DEFAULT NULL,
   `NULLIF(c_decimal103,  c_time)` decimal(10,3) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_varchar10,  1),
@@ -902,7 +902,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_varchar10,  c_timestamp3)` varchar(10) DEFAULT NULL,
   `NULLIF(c_varchar10,  c_date)` varchar(10) DEFAULT NULL,
   `NULLIF(c_varchar10,  c_time)` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_tinytext,  1),
@@ -941,7 +941,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_tinytext,  c_timestamp3)` tinytext DEFAULT NULL,
   `NULLIF(c_tinytext,  c_date)` tinytext DEFAULT NULL,
   `NULLIF(c_tinytext,  c_time)` tinytext DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_text,  1),
@@ -980,7 +980,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_text,  c_timestamp3)` text DEFAULT NULL,
   `NULLIF(c_text,  c_date)` text DEFAULT NULL,
   `NULLIF(c_text,  c_time)` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_mediumtext,  1),
@@ -1019,7 +1019,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_mediumtext,  c_timestamp3)` mediumtext DEFAULT NULL,
   `NULLIF(c_mediumtext,  c_date)` mediumtext DEFAULT NULL,
   `NULLIF(c_mediumtext,  c_time)` mediumtext DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_longtext,  1),
@@ -1058,7 +1058,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_longtext,  c_timestamp3)` longtext DEFAULT NULL,
   `NULLIF(c_longtext,  c_date)` longtext DEFAULT NULL,
   `NULLIF(c_longtext,  c_time)` longtext DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_tinyblob,  1),
@@ -1097,7 +1097,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_tinyblob,  c_timestamp3)` tinyblob DEFAULT NULL,
   `NULLIF(c_tinyblob,  c_date)` tinyblob DEFAULT NULL,
   `NULLIF(c_tinyblob,  c_time)` tinyblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_blob,  1),
@@ -1136,7 +1136,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_blob,  c_timestamp3)` blob DEFAULT NULL,
   `NULLIF(c_blob,  c_date)` blob DEFAULT NULL,
   `NULLIF(c_blob,  c_time)` blob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_mediumblob,  1),
@@ -1175,7 +1175,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_mediumblob,  c_timestamp3)` mediumblob DEFAULT NULL,
   `NULLIF(c_mediumblob,  c_date)` mediumblob DEFAULT NULL,
   `NULLIF(c_mediumblob,  c_time)` mediumblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_longblob,  1),
@@ -1214,7 +1214,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_longblob,  c_timestamp3)` longblob DEFAULT NULL,
   `NULLIF(c_longblob,  c_date)` longblob DEFAULT NULL,
   `NULLIF(c_longblob,  c_time)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_enum,  1),
@@ -1253,7 +1253,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_enum,  c_timestamp3)` varchar(4) DEFAULT NULL,
   `NULLIF(c_enum,  c_date)` varchar(4) DEFAULT NULL,
   `NULLIF(c_enum,  c_time)` varchar(4) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_datetime3,  1),
@@ -1292,7 +1292,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_datetime3,  c_timestamp3)` datetime(3) DEFAULT NULL,
   `NULLIF(c_datetime3,  c_date)` datetime(3) DEFAULT NULL,
   `NULLIF(c_datetime3,  c_time)` datetime(3) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_timestamp3,  1),
@@ -1331,7 +1331,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_timestamp3,  c_timestamp3)` timestamp(3) NULL DEFAULT NULL,
   `NULLIF(c_timestamp3,  c_date)` timestamp(3) NULL DEFAULT NULL,
   `NULLIF(c_timestamp3,  c_time)` timestamp(3) NULL DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_date,  1),
@@ -1370,7 +1370,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_date,  c_timestamp3)` date DEFAULT NULL,
   `NULLIF(c_date,  c_date)` date DEFAULT NULL,
   `NULLIF(c_date,  c_time)` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(c_time,  1),
@@ -1409,7 +1409,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(c_time,  c_timestamp3)` time DEFAULT NULL,
   `NULLIF(c_time,  c_date)` time DEFAULT NULL,
   `NULLIF(c_time,  c_time)` time DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 #
 # Checking that the return type depends only on args[0], even if compared to a field
@@ -1451,7 +1451,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(1,  c_timestamp3)` int(1) DEFAULT NULL,
   `NULLIF(1,  c_date)` int(1) DEFAULT NULL,
   `NULLIF(1,  c_time)` int(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(1.0,  1),
@@ -1490,7 +1490,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(1.0,  c_timestamp3)` decimal(2,1) DEFAULT NULL,
   `NULLIF(1.0,  c_date)` decimal(2,1) DEFAULT NULL,
   `NULLIF(1.0,  c_time)` decimal(2,1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(1e0,  1),
@@ -1529,7 +1529,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(1e0,  c_timestamp3)` double DEFAULT NULL,
   `NULLIF(1e0,  c_date)` double DEFAULT NULL,
   `NULLIF(1e0,  c_time)` double DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF('1',  1),
@@ -1568,7 +1568,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF('1',  c_timestamp3)` varchar(1) DEFAULT NULL,
   `NULLIF('1',  c_date)` varchar(1) DEFAULT NULL,
   `NULLIF('1',  c_time)` varchar(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 NULLIF(TIME'10:10:10',  1),
@@ -1607,7 +1607,7 @@ t2	CREATE TABLE `t2` (
   `NULLIF(TIME'10:10:10',  c_timestamp3)` time DEFAULT NULL,
   `NULLIF(TIME'10:10:10',  c_date)` time DEFAULT NULL,
   `NULLIF(TIME'10:10:10',  c_time)` time DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 DROP TABLE t1;
 #