summaryrefslogtreecommitdiff
path: root/mysql-test/main/partition_column.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-09-02 17:32:14 +0400
committerAlexander Barkov <bar@mariadb.com>2022-09-12 22:10:39 +0400
commitf1544424de2b8c9d1c3faefbbdd15543db7dfd12 (patch)
treeebac7186e67915f333a5e9fec2e801ae45c8eccc /mysql-test/main/partition_column.result
parent667df98c3e0f32d391af4eb65c618043720b6a2f (diff)
downloadmariadb-git-f1544424de2b8c9d1c3faefbbdd15543db7dfd12.tar.gz
MDEV-29446 Change SHOW CREATE TABLE to display default collation
Diffstat (limited to 'mysql-test/main/partition_column.result')
-rw-r--r--mysql-test/main/partition_column.result20
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/main/partition_column.result b/mysql-test/main/partition_column.result
index 041c485c1a8..c3a2ce872ce 100644
--- a/mysql-test/main/partition_column.result
+++ b/mysql-test/main/partition_column.result
@@ -29,7 +29,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(255) DEFAULT NULL,
`department` varchar(10) DEFAULT NULL,
`country` varchar(255) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`department`,`country`)
(PARTITION `first_office` VALUES IN (('dep1','Russia'),('dep1','Croatia')) ENGINE = MyISAM,
PARTITION `second_office` VALUES IN (('dep2','Russia')) ENGINE = MyISAM)
@@ -172,7 +172,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(5) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`a`)
(PARTITION `p0` VALUES IN ('''') ENGINE = MyISAM,
PARTITION `p1` VALUES IN ('\\') ENGINE = MyISAM,
@@ -231,7 +231,7 @@ t1 CREATE TABLE `t1` (
`b` char(10) DEFAULT NULL,
`c` varchar(25) DEFAULT NULL,
`d` datetime DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE COLUMNS(`a`,`b`,`c`,`d`)
SUBPARTITION BY HASH (to_seconds(`d`))
SUBPARTITIONS 4
@@ -314,7 +314,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p0` VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
@@ -348,7 +348,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p0` VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
@@ -372,7 +372,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST (`a`)
(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (NULL,4,3) ENGINE = MyISAM)
@@ -402,7 +402,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`a`)
(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (4,NULL,3) ENGINE = MyISAM)
@@ -417,7 +417,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST COLUMNS(`a`)
(PARTITION `p0` VALUES IN (2,1) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (4,NULL,3) ENGINE = MyISAM)
@@ -452,7 +452,7 @@ t1 CREATE TABLE `t1` (
`b` char(10) DEFAULT NULL,
`c` varchar(5) DEFAULT NULL,
`d` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE COLUMNS(`a`,`b`,`c`)
SUBPARTITION BY KEY (`c`,`d`)
SUBPARTITIONS 3
@@ -485,7 +485,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` varchar(2) DEFAULT NULL,
`c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE COLUMNS(`a`,`b`,`c`)
(PARTITION `p0` VALUES LESS THAN (1,'A',1) ENGINE = MyISAM,
PARTITION `p1` VALUES LESS THAN (1,'B',1) ENGINE = MyISAM)