summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2022-10-17 21:44:08 +0300
committerNikita Malyavin <nikitamalyavin@gmail.com>2022-11-02 17:16:07 +0300
commitab65b99b503a51fa791f346ff7668bc9f81a423b (patch)
treee641cf3216d2e3dc335187800298e97ab81ffa35
parentc918d3492490af0e16aa955c9915d6010f96ad81 (diff)
downloadmariadb-git-ab65b99b503a51fa791f346ff7668bc9f81a423b.tar.gz
SHOW CREATE collations
-rw-r--r--mysql-test/main/alter_table_locknone_notembedded.result2
-rw-r--r--mysql-test/main/alter_table_online_debug.result20
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/main/alter_table_locknone_notembedded.result b/mysql-test/main/alter_table_locknone_notembedded.result
index 646b9267ee0..a3cbac0d66a 100644
--- a/mysql-test/main/alter_table_locknone_notembedded.result
+++ b/mysql-test/main/alter_table_locknone_notembedded.result
@@ -21,5 +21,5 @@ t1 CREATE TABLE `t1` (
`f` int(11) DEFAULT NULL,
PRIMARY KEY (`a`),
CONSTRAINT `CONSTRAINT_1` CHECK (`b` > 0)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1 CHECKSUM=1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CHECKSUM=1
drop table t1;
diff --git a/mysql-test/main/alter_table_online_debug.result b/mysql-test/main/alter_table_online_debug.result
index 9d6ae668ae3..5932acd7e0b 100644
--- a/mysql-test/main/alter_table_online_debug.result
+++ b/mysql-test/main/alter_table_online_debug.result
@@ -484,7 +484,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING
select *, UNIX_TIMESTAMP(row_start), UNIX_TIMESTAMP(row_end) from t1 for system_time all;
a b UNIX_TIMESTAMP(row_start) UNIX_TIMESTAMP(row_end)
1 55 1.000000 2147483647.999999
@@ -604,7 +604,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` char(4) DEFAULT NULL,
`b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
abcd 1
@@ -651,7 +651,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a
1
@@ -738,7 +738,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`b` blob DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection default;
drop table t1;
set debug_sync= reset;
@@ -799,7 +799,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a
1
@@ -824,7 +824,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT (`a` + 10)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 11
@@ -850,7 +850,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a
1
@@ -876,8 +876,8 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
- `b` int(11) DEFAULT (`a` + 10)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ `b` int(11) DEFAULT `a`
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 1
@@ -907,7 +907,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) GENERATED ALWAYS AS (`a`) VIRTUAL,
CONSTRAINT `CONSTRAINT_1` CHECK (`b` = `a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 1