summaryrefslogtreecommitdiff
path: root/mysql-test/suite/jp
diff options
context:
space:
mode:
authorRucha Deodhar <rucha.deodhar@mariadb.com>2021-02-15 01:39:37 +0530
committerOleksandr Byelkin <sanja@mariadb.com>2021-05-19 06:48:36 +0200
commit2fdb556e045e9918410086eeaac5a94a4c028626 (patch)
tree1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/suite/jp
parentc366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff)
downloadmariadb-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')
-rw-r--r--mysql-test/suite/jp/r/jp_alter_utf8.result36
-rw-r--r--mysql-test/suite/jp/r/jp_charset_sjis.result18
-rw-r--r--mysql-test/suite/jp/r/jp_charset_ucs2.result18
-rw-r--r--mysql-test/suite/jp/r/jp_charset_ujis.result18
-rw-r--r--mysql-test/suite/jp/r/jp_charset_utf8.result36
-rw-r--r--mysql-test/suite/jp/r/jp_convert_utf8.result204
-rw-r--r--mysql-test/suite/jp/r/jp_create_tbl_utf8.result90
-rw-r--r--mysql-test/suite/jp/r/jp_enum_utf8.result36
8 files changed, 228 insertions, 228 deletions
diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result
index 847a5e628f5..b6a6129dc09 100644
--- a/mysql-test/suite/jp/r/jp_alter_utf8.result
+++ b/mysql-test/suite/jp/r/jp_alter_utf8.result
@@ -44,7 +44,7 @@ Table Create Table
PRIMARY KEY (`锝凤椒锝穈),
UNIQUE KEY `锝革礁锝竊 (`锝革礁锝竊),
KEY `锝讹蕉锝禶 (`锝讹蕉`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝讹蕉锝禶;
ALTER TABLE `锝憋奖锝盽 DROP PRIMARY KEY;
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝革礁锝竊;
@@ -63,7 +63,7 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝凤椒锝穈 char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 ADD `銇嬨亱銇媊 char(1) FIRST;
ALTER TABLE `銇傘亗銇俙 ADD `銇忋亸銇廯 char(1) AFTER `銇嶃亶銇峘;
ALTER TABLE `銇傘亗銇俙 ADD `銇戙亼銇慲 char(1);
@@ -93,7 +93,7 @@ Table Create Table
PRIMARY KEY (`銇嶃亶銇峘),
UNIQUE KEY `銇忋亸銇廯 (`銇忋亸銇廯),
KEY `銇嬨亱銇媊 (`銇嬨亱`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇嬨亱銇媊;
ALTER TABLE `銇傘亗銇俙 DROP PRIMARY KEY;
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇忋亸銇廯;
@@ -112,7 +112,7 @@ SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嶃亶銇峘 char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 ADD `涓勪竸涓刞 char(1) FIRST;
ALTER TABLE `榫栭緰榫朻 ADD `涓呬竻涓卄 char(1) AFTER `涓備競涓俙;
ALTER TABLE `榫栭緰榫朻 ADD `涔氫箽涔歚 char(1);
@@ -142,7 +142,7 @@ Table Create Table
PRIMARY KEY (`涓備競涓俙),
UNIQUE KEY `涓呬竻涓卄 (`涓呬竻涓卄),
KEY `涓勪竸涓刞 (`涓勪竸`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓勪竸涓刞;
ALTER TABLE `榫栭緰榫朻 DROP PRIMARY KEY;
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓呬竻涓卄;
@@ -161,7 +161,7 @@ SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `銇傘亗銇俙;
@@ -206,7 +206,7 @@ Table Create Table
PRIMARY KEY (`锝凤椒锝穈),
UNIQUE KEY `锝革礁锝竊 (`锝革礁锝竊),
KEY `锝讹蕉锝禶 (`锝讹蕉`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝讹蕉锝禶;
ALTER TABLE `锝憋奖锝盽 DROP PRIMARY KEY;
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝革礁锝竊;
@@ -225,7 +225,7 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝凤椒锝穈 char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 ADD `銇嬨亱銇媊 char(1) FIRST;
ALTER TABLE `銇傘亗銇俙 ADD `銇忋亸銇廯 char(1) AFTER `銇嶃亶銇峘;
ALTER TABLE `銇傘亗銇俙 ADD `銇戙亼銇慲 char(1);
@@ -255,7 +255,7 @@ Table Create Table
PRIMARY KEY (`銇嶃亶銇峘),
UNIQUE KEY `銇忋亸銇廯 (`銇忋亸銇廯),
KEY `銇嬨亱銇媊 (`銇嬨亱`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇嬨亱銇媊;
ALTER TABLE `銇傘亗銇俙 DROP PRIMARY KEY;
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇忋亸銇廯;
@@ -274,7 +274,7 @@ SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嶃亶銇峘 char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 ADD `涓勪竸涓刞 char(1) FIRST;
ALTER TABLE `榫栭緰榫朻 ADD `涓呬竻涓卄 char(1) AFTER `涓備競涓俙;
ALTER TABLE `榫栭緰榫朻 ADD `涔氫箽涔歚 char(1);
@@ -304,7 +304,7 @@ Table Create Table
PRIMARY KEY (`涓備競涓俙),
UNIQUE KEY `涓呬竻涓卄 (`涓呬竻涓卄),
KEY `涓勪竸涓刞 (`涓勪竸`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓勪竸涓刞;
ALTER TABLE `榫栭緰榫朻 DROP PRIMARY KEY;
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓呬竻涓卄;
@@ -323,7 +323,7 @@ SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `銇傘亗銇俙;
@@ -368,7 +368,7 @@ Table Create Table
PRIMARY KEY (`锝凤椒锝穈),
UNIQUE KEY `锝革礁锝竊 (`锝革礁锝竊),
KEY `锝讹蕉锝禶 (`锝讹蕉`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝讹蕉锝禶;
ALTER TABLE `锝憋奖锝盽 DROP PRIMARY KEY;
ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝革礁锝竊;
@@ -387,7 +387,7 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝凤椒锝穈 char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 ADD `銇嬨亱銇媊 char(1) FIRST;
ALTER TABLE `銇傘亗銇俙 ADD `銇忋亸銇廯 char(1) AFTER `銇嶃亶銇峘;
ALTER TABLE `銇傘亗銇俙 ADD `銇戙亼銇慲 char(1);
@@ -417,7 +417,7 @@ Table Create Table
PRIMARY KEY (`銇嶃亶銇峘),
UNIQUE KEY `銇忋亸銇廯 (`銇忋亸銇廯),
KEY `銇嬨亱銇媊 (`銇嬨亱`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇嬨亱銇媊;
ALTER TABLE `銇傘亗銇俙 DROP PRIMARY KEY;
ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇忋亸銇廯;
@@ -436,7 +436,7 @@ SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嶃亶銇峘 char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 ADD `涓勪竸涓刞 char(1) FIRST;
ALTER TABLE `榫栭緰榫朻 ADD `涓呬竻涓卄 char(1) AFTER `涓備競涓俙;
ALTER TABLE `榫栭緰榫朻 ADD `涔氫箽涔歚 char(1);
@@ -466,7 +466,7 @@ Table Create Table
PRIMARY KEY (`涓備競涓俙),
UNIQUE KEY `涓呬竻涓卄 (`涓呬竻涓卄),
KEY `涓勪竸涓刞 (`涓勪竸`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓勪竸涓刞;
ALTER TABLE `榫栭緰榫朻 DROP PRIMARY KEY;
ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓呬竻涓卄;
@@ -485,7 +485,7 @@ SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `銇傘亗銇俙;
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(`俠侾`)
sjis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿侾`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿侾`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -50,7 +50,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俀`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俀`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -62,7 +62,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俁`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俁`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -83,7 +83,7 @@ CHARSET(`俠侾`)
sjis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿係`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿係`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -95,7 +95,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俆`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俆`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -107,7 +107,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俇`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俇`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -128,7 +128,7 @@ CHARSET(`俠侾`)
sjis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俈`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俈`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -140,7 +140,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俉`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俉`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
@@ -152,7 +152,7 @@ CHARSET(CONVERT(`俠侾` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING utf8)) FROM `俿俋`;
CHARSET(CONVERT(`俠侾` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`俠侾` USING ucs2)) FROM `俿俋`;
CHARSET(CONVERT(`俠侾` USING ucs2))
ucs2
diff --git a/mysql-test/suite/jp/r/jp_charset_ucs2.result b/mysql-test/suite/jp/r/jp_charset_ucs2.result
index c5aee82c3c5..71fb61259c8 100644
--- a/mysql-test/suite/jp/r/jp_charset_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_charset_ucs2.result
@@ -95,7 +95,7 @@ CHARSET(`Ｃ１`)
ucs2
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -107,7 +107,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ２`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ２`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -119,7 +119,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ３`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ３`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -140,7 +140,7 @@ CHARSET(`Ｃ１`)
ucs2
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ４`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ４`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -152,7 +152,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ５`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ５`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -164,7 +164,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ６`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -185,7 +185,7 @@ CHARSET(`Ｃ１`)
ucs2
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ７`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ７`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -197,7 +197,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ８`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ８`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -209,7 +209,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ９`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
diff --git a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result
index 746b53ee5e1..327e16e85ff 100644
--- a/mysql-test/suite/jp/r/jp_charset_ujis.result
+++ b/mysql-test/suite/jp/r/jp_charset_ujis.result
@@ -38,7 +38,7 @@ CHARSET(`Ｃ１`)
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -50,7 +50,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ２`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ２`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -62,7 +62,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ３`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ３`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -83,7 +83,7 @@ CHARSET(`Ｃ１`)
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ４`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ４`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -95,7 +95,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ５`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ５`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -107,7 +107,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ６`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -128,7 +128,7 @@ CHARSET(`Ｃ１`)
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ７`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ７`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -140,7 +140,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ８`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ８`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
@@ -152,7 +152,7 @@ CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ９`;
CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
CHARSET(CONVERT(`Ｃ１` USING ucs2))
ucs2
diff --git a/mysql-test/suite/jp/r/jp_charset_utf8.result b/mysql-test/suite/jp/r/jp_charset_utf8.result
index 9f22bda74f0..46b28596bc6 100644
--- a/mysql-test/suite/jp/r/jp_charset_utf8.result
+++ b/mysql-test/suite/jp/r/jp_charset_utf8.result
@@ -29,16 +29,16 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `锛达紭`
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `锛达紮`;
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紤`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紥`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紦`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紤`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紤`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -50,7 +50,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紥`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紥`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -62,7 +62,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紦`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紦`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -74,16 +74,16 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紨`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紩`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紪`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紨`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紨`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -95,7 +95,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紩`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紩`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -107,7 +107,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紪`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紪`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -119,16 +119,16 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紬`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紭`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(`锛ｏ紤`) FROM `锛达紮`;
CHARSET(`锛ｏ紤`)
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紬`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紬`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -140,7 +140,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紭`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紭`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
@@ -152,7 +152,7 @@ CHARSET(CONVERT(`锛ｏ紤` USING ujis))
ujis
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING utf8)) FROM `锛达紮`;
CHARSET(CONVERT(`锛ｏ紤` USING utf8))
-utf8
+utf8mb3
SELECT DISTINCT CHARSET(CONVERT(`锛ｏ紤` USING ucs2)) FROM `锛达紮`;
CHARSET(CONVERT(`锛ｏ紤` USING ucs2))
ucs2
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index e33edfb1c3f..74776c16ec2 100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
@@ -132,7 +132,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紥`;
锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紥`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉 胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉
@@ -270,7 +270,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紥`;
锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'sjis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紦`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ujis)
锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -314,7 +314,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紦`;
榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBD9E to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紦`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -400,37 +400,37 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紦`;
榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬 ????????????????????
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 ????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3AA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC38A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B5 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC795 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC796 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2A4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC582 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD088 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC381 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC386 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB9B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCEAC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD192 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCE86 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A6 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD082 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2BA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB98 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B882 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BBB8 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B99A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BBA1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BC99 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BD9F to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BCAB to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BD97 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BE94 to 'sjis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紨`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ujis)
!"#$%&'()*+,-./ !"#$%&'()*+,-./
@@ -536,7 +536,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紩`;
锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紩`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉 胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉
@@ -674,7 +674,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紩`;
锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'sjis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紪`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ujis)
锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -718,7 +718,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紪`;
榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBD9E to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紪`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -804,37 +804,37 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紪`;
榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬 ????????????????????
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 ????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3AA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC38A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B5 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC795 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC796 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2A4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC582 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD088 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC381 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC386 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB9B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCEAC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD192 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCE86 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A6 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD082 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2BA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB98 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B882 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BBB8 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B99A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BBA1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BC99 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BD9F to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BCAB to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BD97 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BE94 to 'sjis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紬`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ujis)
!"#$%&'()*+,-./ !"#$%&'()*+,-./
@@ -940,7 +940,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紭`;
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紭`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
銆銆銆併傦紝锛庛兓锛氾紱锛燂紒銈涖倻麓锝篓锛撅浚锛裤兘 銆銆銆併傦紝锛庛兓锛氾紱锛燂紒銈涖倻麓锝篓锛撅浚锛裤兘
@@ -1078,7 +1078,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紭`;
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBCBC to 'sjis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紮`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ujis)
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵
@@ -1122,7 +1122,7 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ujis) FROM `锛达紮`;
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xEFBD9E to 'ujis'
SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using ucs2) FROM `锛达紮`;
锛ｏ紤 CONVERT(`锛ｏ紤` using ucs2)
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵
@@ -1208,37 +1208,37 @@ SELECT `锛ｏ紤`, CONVERT(`锛ｏ紤` using sjis) FROM `锛达紮`;
榫旈緰榫楅緸榫￠劲榫ｉ茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 ????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
Warnings:
-Warning 1977 Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning 1977 Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB98 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCB9B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2BA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC2A4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCE86 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xCEAC to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD082 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD088 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xD192 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC386 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A6 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC582 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC381 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC38A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B4 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC795 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3A1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC3AA to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC4B5 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC59B to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xC796 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B882 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4B99A to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BBA1 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BC99 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE4BD9F to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BBB8 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BCAB to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BD97 to 'sjis'
+Warning 1977 Cannot convert 'utf8mb3' character 0xE9BE94 to 'sjis'
drop table `锛达紤`;
drop table `锛达紥`;
drop table `锛达紦`;
diff --git a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
index 5dc64d2df5c..0e528db8c58 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
@@ -97,77 +97,77 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝讹蕉锝禶 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝诧讲锝瞏;
Table Create Table
锝诧讲锝 CREATE TABLE `锝诧讲锝瞏 (
`锝凤椒锝穈 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝筹匠锝砢;
Table Create Table
锝筹匠锝 CREATE TABLE `锝筹匠锝砢 (
`锝革礁锝竊 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝达酱锝碻;
Table Create Table
锝达酱锝 CREATE TEMPORARY TABLE `锝达酱锝碻 (
`锝癸焦锝筦 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝碉降锝礰;
Table Create Table
锝碉降锝 CREATE TEMPORARY TABLE `锝碉降锝礰 (
`锝猴胶锝篳 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嬨亱銇媊 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇勩亜銇刞;
Table Create Table
銇勩亜銇 CREATE TABLE `銇勩亜銇刞 (
`銇嶃亶銇峘 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇嗐亞銇哷;
Table Create Table
銇嗐亞銇 CREATE TABLE `銇嗐亞銇哷 (
`銇忋亸銇廯 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇堛亪銇坄;
Table Create Table
銇堛亪銇 CREATE TEMPORARY TABLE `銇堛亪銇坄 (
`銇戙亼銇慲 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇娿亰銇奰;
Table Create Table
銇娿亰銇 CREATE TEMPORARY TABLE `銇娿亰銇奰 (
`銇撱亾銇揱 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫楅緱榫梎;
Table Create Table
榫楅緱榫 CREATE TABLE `榫楅緱榫梎 (
`涓勪竸涓刞 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫為緸榫瀈;
Table Create Table
榫為緸榫 CREATE TABLE `榫為緸榫瀈 (
`涓呬竻涓卄 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫￠尽榫;
Table Create Table
榫￠尽榫 CREATE TEMPORARY TABLE `榫￠尽榫 (
`涓屼笇涓宍 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫㈤劲榫;
Table Create Table
榫㈤劲榫 CREATE TEMPORARY TABLE `榫㈤劲榫 (
`涓掍笒涓抈 char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `锝筹匠锝砢;
@@ -265,77 +265,77 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝讹蕉锝禶 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝诧讲锝瞏;
Table Create Table
锝诧讲锝 CREATE TABLE `锝诧讲锝瞏 (
`锝凤椒锝穈 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝筹匠锝砢;
Table Create Table
锝筹匠锝 CREATE TABLE `锝筹匠锝砢 (
`锝革礁锝竊 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝达酱锝碻;
Table Create Table
锝达酱锝 CREATE TEMPORARY TABLE `锝达酱锝碻 (
`锝癸焦锝筦 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝碉降锝礰;
Table Create Table
锝碉降锝 CREATE TEMPORARY TABLE `锝碉降锝礰 (
`锝猴胶锝篳 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嬨亱銇媊 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇勩亜銇刞;
Table Create Table
銇勩亜銇 CREATE TABLE `銇勩亜銇刞 (
`銇嶃亶銇峘 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇嗐亞銇哷;
Table Create Table
銇嗐亞銇 CREATE TABLE `銇嗐亞銇哷 (
`銇忋亸銇廯 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇堛亪銇坄;
Table Create Table
銇堛亪銇 CREATE TEMPORARY TABLE `銇堛亪銇坄 (
`銇戙亼銇慲 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇娿亰銇奰;
Table Create Table
銇娿亰銇 CREATE TEMPORARY TABLE `銇娿亰銇奰 (
`銇撱亾銇揱 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫楅緱榫梎;
Table Create Table
榫楅緱榫 CREATE TABLE `榫楅緱榫梎 (
`涓勪竸涓刞 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫為緸榫瀈;
Table Create Table
榫為緸榫 CREATE TABLE `榫為緸榫瀈 (
`涓呬竻涓卄 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫￠尽榫;
Table Create Table
榫￠尽榫 CREATE TEMPORARY TABLE `榫￠尽榫 (
`涓屼笇涓宍 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫㈤劲榫;
Table Create Table
榫㈤劲榫 CREATE TEMPORARY TABLE `榫㈤劲榫 (
`涓掍笒涓抈 char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `锝筹匠锝砢;
@@ -433,77 +433,77 @@ SHOW CREATE TABLE `锝憋奖锝盽;
Table Create Table
锝憋奖锝 CREATE TABLE `锝憋奖锝盽 (
`锝讹蕉锝禶 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝诧讲锝瞏;
Table Create Table
锝诧讲锝 CREATE TABLE `锝诧讲锝瞏 (
`锝凤椒锝穈 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝筹匠锝砢;
Table Create Table
锝筹匠锝 CREATE TABLE `锝筹匠锝砢 (
`锝革礁锝竊 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝达酱锝碻;
Table Create Table
锝达酱锝 CREATE TEMPORARY TABLE `锝达酱锝碻 (
`锝癸焦锝筦 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锝碉降锝礰;
Table Create Table
锝碉降锝 CREATE TEMPORARY TABLE `锝碉降锝礰 (
`锝猴胶锝篳 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇傘亗銇俙;
Table Create Table
銇傘亗銇 CREATE TABLE `銇傘亗銇俙 (
`銇嬨亱銇媊 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇勩亜銇刞;
Table Create Table
銇勩亜銇 CREATE TABLE `銇勩亜銇刞 (
`銇嶃亶銇峘 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇嗐亞銇哷;
Table Create Table
銇嗐亞銇 CREATE TABLE `銇嗐亞銇哷 (
`銇忋亸銇廯 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇堛亪銇坄;
Table Create Table
銇堛亪銇 CREATE TEMPORARY TABLE `銇堛亪銇坄 (
`銇戙亼銇慲 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `銇娿亰銇奰;
Table Create Table
銇娿亰銇 CREATE TEMPORARY TABLE `銇娿亰銇奰 (
`銇撱亾銇揱 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫栭緰榫朻;
Table Create Table
榫栭緰榫 CREATE TABLE `榫栭緰榫朻 (
`涓備競涓俙 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫楅緱榫梎;
Table Create Table
榫楅緱榫 CREATE TABLE `榫楅緱榫梎 (
`涓勪竸涓刞 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫為緸榫瀈;
Table Create Table
榫為緸榫 CREATE TABLE `榫為緸榫瀈 (
`涓呬竻涓卄 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫￠尽榫;
Table Create Table
榫￠尽榫 CREATE TEMPORARY TABLE `榫￠尽榫 (
`涓屼笇涓宍 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `榫㈤劲榫;
Table Create Table
榫㈤劲榫 CREATE TEMPORARY TABLE `榫㈤劲榫 (
`涓掍笒涓抈 char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
DROP TABLE `锝憋奖锝盽;
DROP TABLE `锝诧讲锝瞏;
DROP TABLE `锝筹匠锝砢;
diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
index 861aef0462d..f39a2a39b95 100644
--- a/mysql-test/suite/jp/r/jp_enum_utf8.result
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.result
@@ -77,55 +77,55 @@ Table Create Table
锛达紤 CREATE TABLE `锛达紤` (
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紥`;
Table Create Table
锛达紥 CREATE TABLE `锛达紥` (
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紦`;
Table Create Table
锛达紦 CREATE TABLE `锛达紦` (
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紨`;
Table Create Table
锛达紨 CREATE TABLE `锛达紨` (
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紩`;
Table Create Table
锛达紩 CREATE TABLE `锛达紩` (
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紪`;
Table Create Table
锛达紪 CREATE TABLE `锛达紪` (
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紬`;
Table Create Table
锛达紬 CREATE TABLE `锛达紬` (
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紭`;
Table Create Table
锛达紭 CREATE TABLE `锛达紭` (
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紮`;
Table Create Table
锛达紮 CREATE TABLE `锛达紮` (
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
DESC `锛达紤`;
Field Type Null Key Default Extra
锛ｏ紤 enum('锝','锝','锝') YES MUL NULL
@@ -168,63 +168,63 @@ Table Create Table
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紥`;
Table Create Table
锛达紥 CREATE TABLE `锛达紥` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紦`;
Table Create Table
锛达紦 CREATE TABLE `锛达紦` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紨`;
Table Create Table
锛达紨 CREATE TABLE `锛达紨` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紩`;
Table Create Table
锛达紩 CREATE TABLE `锛达紩` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紪`;
Table Create Table
锛达紪 CREATE TABLE `锛达紪` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紬`;
Table Create Table
锛达紬 CREATE TABLE `锛达紬` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('锝','锝','锝') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紭`;
Table Create Table
锛达紭 CREATE TABLE `锛达紭` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('銇','銇','銇') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
SHOW CREATE TABLE `锛达紮`;
Table Create Table
锛达紮 CREATE TABLE `锛达紮` (
`锛ｏ紥` char(1) NOT NULL,
`锛ｏ紤` enum('榫','榫','榫') DEFAULT NULL,
KEY `锛ｏ紤` (`锛ｏ紤`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
DESC `锛达紤`;
Field Type Null Key Default Extra
锛ｏ紥 char(1) NO NULL
View Lorry Controller Status