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/partition_alter.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test/main/partition_alter.result') diff --git a/mysql-test/main/partition_alter.result b/mysql-test/main/partition_alter.result index 997a5cf97fa..18142b63d10 100644 --- a/mysql-test/main/partition_alter.result +++ b/mysql-test/main/partition_alter.result @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `b` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`,`d`), CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE COLUMNS(`d`) (PARTITION `p1` VALUES LESS THAN ('2016-10-18') ENGINE = InnoDB, PARTITION `p2` VALUES LESS THAN ('2020-10-19') ENGINE = InnoDB) @@ -94,7 +94,7 @@ t1 CREATE TABLE `t1` ( `b` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`,`d`), CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE COLUMNS(`d`) (PARTITION `p1` VALUES LESS THAN ('2016-10-18') ENGINE = MyISAM, PARTITION `p2` VALUES LESS THAN ('2020-10-19') ENGINE = MyISAM) @@ -116,7 +116,7 @@ t1 CREATE TABLE `t1` ( `dt2` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`id_2`,`id_3`), KEY `id_1` (`id_1`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DELAY_KEY_WRITE=1 PARTITION BY HASH (`id_2`) (PARTITION `p01` ENGINE = MyISAM, PARTITION `p02` ENGINE = MyISAM, -- cgit v1.2.1