summaryrefslogtreecommitdiff
path: root/mysql-test/main/mrr_icp_extra.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/mrr_icp_extra.result
parent667df98c3e0f32d391af4eb65c618043720b6a2f (diff)
downloadmariadb-git-f1544424de2b8c9d1c3faefbbdd15543db7dfd12.tar.gz
MDEV-29446 Change SHOW CREATE TABLE to display default collation
Diffstat (limited to 'mysql-test/main/mrr_icp_extra.result')
-rw-r--r--mysql-test/main/mrr_icp_extra.result28
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/main/mrr_icp_extra.result b/mysql-test/main/mrr_icp_extra.result
index 95788b393dd..46f42ece3a0 100644
--- a/mysql-test/main/mrr_icp_extra.result
+++ b/mysql-test/main/mrr_icp_extra.result
@@ -231,7 +231,7 @@ t1 CREATE TABLE `t1` (
`v` varchar(10) DEFAULT NULL,
`c` char(10) DEFAULT NULL,
`t` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
create table t2 like t1;
show create table t2;
Table Create Table
@@ -239,7 +239,7 @@ t2 CREATE TABLE `t2` (
`v` varchar(10) DEFAULT NULL,
`c` char(10) DEFAULT NULL,
`t` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
create table t3 select * from t1;
show create table t3;
Table Create Table
@@ -247,7 +247,7 @@ t3 CREATE TABLE `t3` (
`v` varchar(10) DEFAULT NULL,
`c` char(10) DEFAULT NULL,
`t` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t1 modify c varchar(10);
show create table t1;
Table Create Table
@@ -255,7 +255,7 @@ t1 CREATE TABLE `t1` (
`v` varchar(10) DEFAULT NULL,
`c` varchar(10) DEFAULT NULL,
`t` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t1 modify v char(10);
show create table t1;
Table Create Table
@@ -263,7 +263,7 @@ t1 CREATE TABLE `t1` (
`v` char(10) DEFAULT NULL,
`c` varchar(10) DEFAULT NULL,
`t` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t1 modify t varchar(10);
Warnings:
Note 1265 Data truncated for column 't' at row 2
@@ -273,7 +273,7 @@ t1 CREATE TABLE `t1` (
`v` char(10) DEFAULT NULL,
`c` varchar(10) DEFAULT NULL,
`t` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select concat('*',v,'*',c,'*',t,'*') from t1;
concat('*',v,'*',c,'*',t,'*')
*+*+*+ *
@@ -289,7 +289,7 @@ t1 CREATE TABLE `t1` (
KEY `v` (`v`),
KEY `c` (`c`),
KEY `t` (`t`(10))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select count(*) from t1;
count(*)
270
@@ -513,7 +513,7 @@ t1 CREATE TABLE `t1` (
KEY `c` (`c`),
KEY `t` (`t`(10)),
KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select count(*) from t1 where v='a';
count(*)
10
@@ -593,7 +593,7 @@ t1 CREATE TABLE `t1` (
KEY `c` (`c`),
KEY `t` (`t`(10)),
KEY `v` (`v`(30))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select count(*) from t1 where v='a';
count(*)
10
@@ -673,7 +673,7 @@ t1 CREATE TABLE `t1` (
KEY `c` (`c`),
KEY `t` (`t`(10)),
KEY `v` (`v`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select v,count(*) from t1 group by v limit 10;
v count(*)
a 1
@@ -751,14 +751,14 @@ t1 CREATE TABLE `t1` (
KEY `v` (`v`(5)),
KEY `c` (`c`(5)),
KEY `t` (`t`(5))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
create table t1 (v char(10) character set utf8);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `v` char(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ `v` char(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
create table t1 (v varchar(10), c char(10)) row_format=fixed;
show create table t1;
@@ -766,7 +766,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`v` varchar(10) DEFAULT NULL,
`c` char(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=FIXED
insert into t1 values('a','a'),('a ','a ');
select concat('*',v,'*',c,'*') from t1;
concat('*',v,'*',c,'*')