diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/suite/jp/r/jp_charset_sjis.result | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'mysql-test/suite/jp/r/jp_charset_sjis.result')
| -rw-r--r-- | mysql-test/suite/jp/r/jp_charset_sjis.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/jp/r/jp_charset_sjis.result b/mysql-test/suite/jp/r/jp_charset_sjis.result index 049f872cfa1..06371a7d6a3 100644 --- a/mysql-test/suite/jp/r/jp_charset_sjis.result +++ b/mysql-test/suite/jp/r/jp_charset_sjis.result @@ -38,7 +38,7 @@ CHARSET(`‚b‚P`) sjis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚P`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚P`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -50,7 +50,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚Q`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚Q`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -62,7 +62,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚R`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚R`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -83,7 +83,7 @@ CHARSET(`‚b‚P`) sjis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚S`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚S`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -95,7 +95,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚T`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚T`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -107,7 +107,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚U`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚U`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -128,7 +128,7 @@ CHARSET(`‚b‚P`) sjis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚V`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚V`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -140,7 +140,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚W`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚W`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 @@ -152,7 +152,7 @@ CHARSET(CONVERT(`‚b‚P` USING ujis)) ujis SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING utf8)) FROM `‚s‚X`; CHARSET(CONVERT(`‚b‚P` USING utf8)) -utf8 +utf8mb3 SELECT DISTINCT CHARSET(CONVERT(`‚b‚P` USING ucs2)) FROM `‚s‚X`; CHARSET(CONVERT(`‚b‚P` USING ucs2)) ucs2 |