From f1544424de2b8c9d1c3faefbbdd15543db7dfd12 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Fri, 2 Sep 2022 17:32:14 +0400 Subject: MDEV-29446 Change SHOW CREATE TABLE to display default collation --- mysql-test/main/create-uca.result | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mysql-test/main/create-uca.result') diff --git a/mysql-test/main/create-uca.result b/mysql-test/main/create-uca.result index f405cb72b40..5a5e9d6faa7 100644 --- a/mysql-test/main/create-uca.result +++ b/mysql-test/main/create-uca.result @@ -13,9 +13,9 @@ t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT 12 COMMENT 'column1', `c2` int(11) DEFAULT NULL COMMENT 'column2', `c3` int(11) NOT NULL COMMENT 'column3', - `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a', + `c4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b', - `c6` varchar(255) COLLATE latin1_bin DEFAULT NULL + `c6` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin CREATE TABLE t2 AS SELECT * FROM t1; SHOW CREATE TABLE t2; @@ -24,8 +24,8 @@ t2 CREATE TABLE `t2` ( `c1` int(11) DEFAULT 12 COMMENT 'column1', `c2` int(11) DEFAULT NULL COMMENT 'column2', `c3` int(11) NOT NULL COMMENT 'column3', - `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a', + `c4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'a', `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b', `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; -- cgit v1.2.1