summaryrefslogtreecommitdiff
path: root/mysql-test/main/ctype_upgrade.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/ctype_upgrade.result')
-rw-r--r--mysql-test/main/ctype_upgrade.result38
1 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/main/ctype_upgrade.result b/mysql-test/main/ctype_upgrade.result
index efad15f87f3..6ed7f0d3ca5 100644
--- a/mysql-test/main/ctype_upgrade.result
+++ b/mysql-test/main/ctype_upgrade.result
@@ -18,7 +18,7 @@ test.maria050313_utf8_croatian_ci check status OK
SHOW CREATE TABLE maria050313_utf8_croatian_ci;
Table Create Table
maria050313_utf8_croatian_ci CREATE TABLE `maria050313_utf8_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT count(*) FROM maria050313_utf8_croatian_ci;
count(*)
@@ -29,7 +29,7 @@ ALTER TABLE maria050313_utf8_croatian_ci FORCE;
SHOW CREATE TABLE maria050313_utf8_croatian_ci;
Table Create Table
maria050313_utf8_croatian_ci CREATE TABLE `maria050313_utf8_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria050313_utf8_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
@@ -53,7 +53,7 @@ SHOW CREATE TABLE maria050313_ucs2_croatian_ci_def;
Table Create Table
maria050313_ucs2_croatian_ci_def CREATE TABLE `maria050313_ucs2_croatian_ci_def` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
DROP TABLE maria050313_ucs2_croatian_ci_def;
# Copying maria050313_ucs2_croatian_ci.* to MYSQLD_DATADIR
CHECK TABLE maria050313_ucs2_croatian_ci_def;
@@ -69,7 +69,7 @@ SHOW CREATE TABLE maria050313_ucs2_croatian_ci_def;
Table Create Table
maria050313_ucs2_croatian_ci_def CREATE TABLE `maria050313_ucs2_croatian_ci_def` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
SELECT * FROM maria050313_ucs2_croatian_ci_def ORDER BY a;
a
1
@@ -91,7 +91,7 @@ test.maria050533_xxx_croatian_ci repair status OK
SHOW CREATE TABLE maria050533_xxx_croatian_ci;
Table Create Table
maria050533_xxx_croatian_ci CREATE TABLE `maria050533_xxx_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
@@ -106,7 +106,7 @@ ALTER TABLE maria050533_xxx_croatian_ci FORCE;
SHOW CREATE TABLE maria050533_xxx_croatian_ci;
Table Create Table
maria050533_xxx_croatian_ci CREATE TABLE `maria050533_xxx_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
@@ -150,24 +150,24 @@ test.maria100004_xxx_croatian_ci repair status OK
SHOW CREATE TABLE maria100004_xxx_croatian_ci;
Table Create Table
maria100004_xxx_croatian_ci CREATE TABLE `maria100004_xxx_croatian_ci` (
- `a` varchar(10) COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
`e` varchar(10) CHARACTER SET utf32 COLLATE utf32_croatian_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
DROP TABLE maria100004_xxx_croatian_ci;
# Copying maria100004_xxx_croatian_ci.* to MYSQLD_DATADIR
ALTER TABLE maria100004_xxx_croatian_ci FORCE;
SHOW CREATE TABLE maria100004_xxx_croatian_ci;
Table Create Table
maria100004_xxx_croatian_ci CREATE TABLE `maria100004_xxx_croatian_ci` (
- `a` varchar(10) COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
`e` varchar(10) CHARACTER SET utf32 COLLATE utf32_croatian_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
nJ
@@ -201,12 +201,12 @@ test.mysql050614_xxx_croatian_ci check status OK
SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
Table Create Table
mysql050614_xxx_croatian_ci CREATE TABLE `mysql050614_xxx_croatian_ci` (
- `a` varchar(10) COLLATE utf8_croatian_mysql561_ci DEFAULT NULL,
+ `a` varchar(10) COLLATE utf8mb3_croatian_mysql561_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_mysql561_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_mysql561_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_mysql561_ci DEFAULT NULL,
`e` varchar(10) CHARACTER SET utf32 COLLATE utf32_croatian_mysql561_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_mysql561_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_mysql561_ci
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
NJ,Nj,nJ,nj
@@ -545,7 +545,7 @@ SHOW CREATE TABLE maria050313_ucs2_croatian_ci_def;
Table Create Table
maria050313_ucs2_croatian_ci_def CREATE TABLE `maria050313_ucs2_croatian_ci_def` (
`a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
SELECT * FROM maria050313_ucs2_croatian_ci_def ORDER BY a;
a
1
@@ -554,7 +554,7 @@ a
SHOW CREATE TABLE maria050313_utf8_croatian_ci;
Table Create Table
maria050313_utf8_croatian_ci CREATE TABLE `maria050313_utf8_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria050313_utf8_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
@@ -563,7 +563,7 @@ NJ,Nj,nj
SHOW CREATE TABLE maria050533_xxx_croatian_ci;
Table Create Table
maria050533_xxx_croatian_ci CREATE TABLE `maria050533_xxx_croatian_ci` (
- `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
@@ -576,12 +576,12 @@ NJ,Nj,nj
SHOW CREATE TABLE maria100004_xxx_croatian_ci;
Table Create Table
maria100004_xxx_croatian_ci CREATE TABLE `maria100004_xxx_croatian_ci` (
- `a` varchar(10) COLLATE utf8_croatian_ci DEFAULT NULL,
+ `a` varchar(10) COLLATE utf8mb3_croatian_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_ci DEFAULT NULL,
`e` varchar(10) CHARACTER SET utf32 COLLATE utf32_croatian_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_ci
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
nJ
@@ -589,12 +589,12 @@ NJ,Nj,nj
SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
Table Create Table
mysql050614_xxx_croatian_ci CREATE TABLE `mysql050614_xxx_croatian_ci` (
- `a` varchar(10) COLLATE utf8_croatian_mysql561_ci DEFAULT NULL,
+ `a` varchar(10) COLLATE utf8mb3_croatian_mysql561_ci DEFAULT NULL,
`b` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_croatian_mysql561_ci DEFAULT NULL,
`c` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_croatian_mysql561_ci DEFAULT NULL,
`d` varchar(10) CHARACTER SET utf16 COLLATE utf16_croatian_mysql561_ci DEFAULT NULL,
`e` varchar(10) CHARACTER SET utf32 COLLATE utf32_croatian_mysql561_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_croatian_mysql561_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_croatian_mysql561_ci
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
GROUP_CONCAT(a ORDER BY BINARY a)
NJ,Nj,nJ,nj
View Lorry Controller Status