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.

119 files changed, 3332 insertions, 3332 deletions

diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index 48db24d24b2..a2830b95294 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -902,7 +902,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 drop table t1;
 create table t1 (a mediumtext character set latin1);
 alter table t1 convert to character set utf8;
@@ -910,7 +910,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` longtext DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 drop table t1;
 End of 5.0 tests
 drop table if exists t1, t2, t3;
@@ -1373,7 +1373,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `consultant_id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 CREATE TABLE t1 (
 `a` int(11) DEFAULT NULL
@@ -1385,7 +1385,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `consultant_id` int(11) NOT NULL DEFAULT 2
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 CREATE TABLE t1 (
 `a` int(11) DEFAULT NULL
@@ -1397,7 +1397,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `consultant_id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 CREATE TABLE t1 (
 `a` int(11) DEFAULT NULL
@@ -1410,7 +1410,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `consultant_id` bigint(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 #
 # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS
@@ -2230,7 +2230,7 @@ t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   `a` int(11) NOT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 #
 # MDEV-15308
diff --git a/mysql-test/main/bug47671.result b/mysql-test/main/bug47671.result
index 55e422c12d9..96e24c1e85d 100644
--- a/mysql-test/main/bug47671.result
+++ b/mysql-test/main/bug47671.result
@@ -5,10 +5,10 @@
 --------------
 
 Server:			MariaDB
-Server characterset:	utf8
-Db     characterset:	utf8
-Client characterset:	utf8
-Conn.  characterset:	utf8
+Server characterset:	utf8mb3
+Db     characterset:	utf8mb3
+Client characterset:	utf8mb3
+Conn.  characterset:	utf8mb3
 
 --------------
 
diff --git a/mysql-test/main/cast.result b/mysql-test/main/cast.result
index 6f6de3c8e79..2c01021c700 100644
--- a/mysql-test/main/cast.result
+++ b/mysql-test/main/cast.result
@@ -477,11 +477,11 @@ c1	c2	c3	c4	c5
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 NOT NULL,
-  `c2` varchar(2) CHARACTER SET utf8 NOT NULL,
-  `c3` varchar(2) CHARACTER SET utf8 NOT NULL,
-  `c4` varchar(2) CHARACTER SET utf8 NOT NULL,
-  `c5` varchar(2) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 NOT NULL,
+  `c2` varchar(2) CHARACTER SET utf8mb3 NOT NULL,
+  `c3` varchar(2) CHARACTER SET utf8mb3 NOT NULL,
+  `c4` varchar(2) CHARACTER SET utf8mb3 NOT NULL,
+  `c5` varchar(2) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a binary(4), b char(4) character set koi8r);
@@ -822,13 +822,13 @@ collation(cast("a" as char(10) binary))
 latin1_bin
 select collation(cast("a" as char(10) charset utf8 binary));
 collation(cast("a" as char(10) charset utf8 binary))
-utf8_bin
+utf8mb3_bin
 select collation(cast("a" as char(10) ascii binary));
 collation(cast("a" as char(10) ascii binary))
 latin1_bin
 select collation(cast("a" as char(10) binary charset utf8));
 collation(cast("a" as char(10) binary charset utf8))
-utf8_bin
+utf8mb3_bin
 select collation(cast("a" as char(10) binary ascii));
 collation(cast("a" as char(10) binary ascii))
 latin1_bin
@@ -1239,14 +1239,14 @@ DECLARE a VARCHAR(30) CHARACTER SET utf8;
 SET a=CAST(_utf8 0xD18F AS CHAR(1) CHARACTER SET latin1);
 END;
 $$
-ERROR HY000: Cannot convert 'utf8' character 0xD18F to 'latin1'
+ERROR HY000: Cannot convert 'utf8mb3' character 0xD18F to 'latin1'
 # Conversion problems still escalate warnings to errors (with right truncation)
 BEGIN NOT ATOMIC
 DECLARE a VARCHAR(30) CHARACTER SET utf8;
 SET a=CAST(_utf8 0xD18FD18F AS CHAR(1) CHARACTER SET latin1);
 END;
 $$
-ERROR HY000: Cannot convert 'utf8' character 0xD18F to 'latin1'
+ERROR HY000: Cannot convert 'utf8mb3' character 0xD18F to 'latin1'
 # CAST(number AS CHAR) escalates warnings to errors on truncation
 CREATE OR REPLACE TABLE t1 (a VARCHAR(10));
 INSERT INTO t1 VALUES (CAST(123 AS CHAR(1)));
diff --git a/mysql-test/main/column_compression.result b/mysql-test/main/column_compression.result
index 01f906b5f31..88e558c4d33 100644
--- a/mysql-test/main/column_compression.result
+++ b/mysql-test/main/column_compression.result
@@ -1483,7 +1483,7 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
 WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
@@ -1509,7 +1509,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)),
   `b` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `c` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `c` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `d` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -1566,7 +1566,7 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -1598,14 +1598,14 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT ''
+  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
+  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -1717,7 +1717,7 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -1749,14 +1749,14 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT ''
+  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
+  `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -1868,7 +1868,7 @@ CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -1900,14 +1900,14 @@ CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT ''
+  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
+  `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -2019,7 +2019,7 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -2051,14 +2051,14 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT ''
+  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
+  `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -2170,7 +2170,7 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -2202,14 +2202,14 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT ''
+  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
+  `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #
@@ -2656,7 +2656,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED);
diff --git a/mysql-test/main/comment_database.result b/mysql-test/main/comment_database.result
index 628a3259b6b..fe9c9ff2931 100644
--- a/mysql-test/main/comment_database.result
+++ b/mysql-test/main/comment_database.result
@@ -51,11 +51,11 @@ USE db1;
 ALTER DATABASE COMMENT 'db1 comment' CHARACTER SET 'utf8';
 SHOW CREATE DATABASE db1;
 Database	Create Database
-db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8 */ COMMENT 'db1 comment'
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */ COMMENT 'db1 comment'
 ALTER DATABASE db1 COMMENT 'this is db1 comment';
 SHOW CREATE DATABASE db1;
 Database	Create Database
-db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8 */ COMMENT 'this is db1 comment'
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */ COMMENT 'this is db1 comment'
 ALTER DATABASE CHARACTER SET 'latin1';
 SHOW CREATE DATABASE db1;
 Database	Create Database
diff --git a/mysql-test/main/comment_table.result b/mysql-test/main/comment_table.result
index d0af71b4540..1a18df8f66b 100644
--- a/mysql-test/main/comment_table.result
+++ b/mysql-test/main/comment_table.result
@@ -126,5 +126,5 @@ SELECT column_comment,char_length(column_comment) FROM information_schema.column
 column_comment	char_length(column_comment)
 set names utf8;
 create table t1 (x int comment 'a�');
-ERROR HY000: Invalid utf8 character string: 'a'
+ERROR HY000: Invalid utf8mb3 character string: 'a'
 set names latin1;
diff --git a/mysql-test/main/constraints.result b/mysql-test/main/constraints.result
index 24f8417d313..3702bff83ec 100644
--- a/mysql-test/main/constraints.result
+++ b/mysql-test/main/constraints.result
@@ -99,7 +99,7 @@ long_enough_name	CREATE TABLE `long_enough_name` (
   `f2` int(11) NOT NULL,
   `f3` int(11) DEFAULT NULL,
   `f4` timestamp NOT NULL DEFAULT current_timestamp(),
-  `f5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'foo',
+  `f5` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT 'foo',
   `f6` smallint(6) NOT NULL DEFAULT 1,
   `f7` int(11) DEFAULT NULL,
   PRIMARY KEY (`pk`),
diff --git a/mysql-test/main/create-uca.result b/mysql-test/main/create-uca.result
index f405cb72b40..29a2c0a9d1a 100644
--- a/mysql-test/main/create-uca.result
+++ b/mysql-test/main/create-uca.result
@@ -13,8 +13,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT 12 COMMENT 'column1',
   `c2` int(11) DEFAULT NULL COMMENT 'column2',
   `c3` int(11) NOT NULL COMMENT 'column3',
-  `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
-  `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
+  `c4` varchar(255) CHARACTER SET utf8mb3 NOT NULL DEFAULT 'a',
+  `c5` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'b',
   `c6` varchar(255) COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
 CREATE TABLE t2 AS SELECT * FROM t1;
@@ -24,8 +24,8 @@ t2	CREATE TABLE `t2` (
   `c1` int(11) DEFAULT 12 COMMENT 'column1',
   `c2` int(11) DEFAULT NULL COMMENT 'column2',
   `c3` int(11) NOT NULL COMMENT 'column3',
-  `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
-  `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
+  `c4` varchar(255) CHARACTER SET utf8mb3 NOT NULL DEFAULT 'a',
+  `c5` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'b',
   `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1,t2;
diff --git a/mysql-test/main/create-uca.test b/mysql-test/main/create-uca.test
index 0acb51f7286..f73f6114962 100644
--- a/mysql-test/main/create-uca.test
+++ b/mysql-test/main/create-uca.test
@@ -1,5 +1,5 @@
 # Prerequisites
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 # Initial cleanup
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result
index 2b68e9f3e9c..299fdfc9b41 100644
--- a/mysql-test/main/create.result
+++ b/mysql-test/main/create.result
@@ -721,7 +721,7 @@ primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(112) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(112) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -736,7 +736,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -752,7 +752,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `b` int(11) NOT NULL,
-  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   `c` int(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -765,7 +765,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
-  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   `c` int(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -777,7 +777,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -789,7 +789,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -1089,7 +1089,7 @@ t1	CREATE TABLE `t1` (
   `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
   `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT 0
-)  DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8mb3
 drop table t1;
 create temporary table t1 like information_schema.processlist;
 show create table t1;
@@ -1113,7 +1113,7 @@ t1	CREATE TEMPORARY TABLE `t1` (
   `QUERY_ID` bigint(4) NOT NULL DEFAULT 0,
   `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT 0
-)  DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8mb3
 drop table t1;
 create table t1 like information_schema.character_sets;
 show create table t1;
@@ -1123,7 +1123,7 @@ t1	CREATE TABLE `t1` (
   `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 drop table t1;
 
 # --
diff --git a/mysql-test/main/create_utf8.result b/mysql-test/main/create_utf8.result
index bb48a0c8ef5..3d6651260ce 100644
--- a/mysql-test/main/create_utf8.result
+++ b/mysql-test/main/create_utf8.result
@@ -46,7 +46,7 @@ Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show create view имя_вью_кодировке_утф8_длиной_больше_чем_42;
 View	Create View	character_set_client	collation_connection
-имя_вью_кодировке_утф8_длиной_больше_чем_42	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`	utf8	utf8_general_ci
+имя_вью_кодировке_утф8_длиной_больше_чем_42	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`	utf8mb3	utf8mb3_general_ci
 create trigger имя_триггера_в_кодировке_утф8_длиной_больше_чем_49
 before insert on имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48 for each row set @a:=1;
 select TRIGGER_NAME from information_schema.triggers where
diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result
index 41ce8f0b82e..66d4bb54023 100644
--- a/mysql-test/main/ctype_big5.result
+++ b/mysql-test/main/ctype_big5.result
@@ -807,70 +807,70 @@ A2C0	Ⅷ
 A2C1	Ⅸ
 A2C2	Ⅹ
 Warnings:
-Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -886,70 +886,70 @@ C7D9	р
 C7DA	с
 C7DB	т
 Warnings:
-Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8mb3'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8mb3'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_cp1250_ch.result b/mysql-test/main/ctype_cp1250_ch.result
index 5799331f73e..b662b5c7740 100644
--- a/mysql-test/main/ctype_cp1250_ch.result
+++ b/mysql-test/main/ctype_cp1250_ch.result
@@ -112,7 +112,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE CONCAT(c1)='a';
@@ -135,7 +135,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE 'a'=CONCAT(c1);
@@ -158,7 +158,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '% '=CONCAT(c1);
@@ -181,7 +181,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '%'=CONCAT(c1);
@@ -207,7 +207,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ';
diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result
index 7d9b47f1f54..5d0bf3be615 100644
--- a/mysql-test/main/ctype_cp1251.result
+++ b/mysql-test/main/ctype_cp1251.result
@@ -386,7 +386,7 @@ FD	FD	FD	D18D	FD
 FE	FE	FE	D18E	FE	
 FF	FF	FF	D18F	FF	
 Warnings:
-Warning	1977	Cannot convert 'cp1251' character 0x98 to 'utf8'
+Warning	1977	Cannot convert 'cp1251' character 0x98 to 'utf8mb3'
 DROP TABLE t1;
 SELECT strcmp('a','a '),   strcmp('a ','a');
 strcmp('a','a ')	strcmp('a ','a')
diff --git a/mysql-test/main/ctype_cp932_binlog_stm.result b/mysql-test/main/ctype_cp932_binlog_stm.result
index 089820d628a..b893ec35c81 100644
--- a/mysql-test/main/ctype_cp932_binlog_stm.result
+++ b/mysql-test/main/ctype_cp932_binlog_stm.result
@@ -387,139 +387,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 81F0	Å
 Warnings:
-Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 Warnings:
-Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8mb3'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test cp932->Unicode conversion
@@ -10195,70 +10195,70 @@ FC49	EFA8AD
 FC4A	E9B899
 FC4B	E9BB91
 Warnings:
-Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EB to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EC to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81ED to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EE to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81EF to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81F8 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81F9 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81FA to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x81FB to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8240 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8241 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8242 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8243 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8244 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8245 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8246 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8247 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8248 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8249 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x824A to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x824B to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x824C to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x824D to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x824E to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x8259 to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825A to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825B to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825C to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825D to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825E to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x825F to 'utf8'
-Warning	1977	Cannot convert 'cp932' character 0x827A to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EB to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EC to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81ED to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EE to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81EF to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81FA to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x81FB to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8240 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8241 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8242 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8243 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8244 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8245 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8246 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8247 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8248 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8249 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x824A to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x824B to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x824C to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x824D to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x824E to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x8259 to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825A to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825B to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825C to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825D to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825E to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x825F to 'utf8mb3'
+Warning	1977	Cannot convert 'cp932' character 0x827A to 'utf8mb3'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
diff --git a/mysql-test/main/ctype_create.result b/mysql-test/main/ctype_create.result
index 9a76802579e..4e8289a8ad6 100644
--- a/mysql-test/main/ctype_create.result
+++ b/mysql-test/main/ctype_create.result
@@ -86,24 +86,24 @@ USE test;
 CREATE DATABASE tmp DEFAULT CHARACTER SET latin5;
 USE tmp;
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET utf8;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET DEFAULT' and 'CHARACTER SET utf8'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET DEFAULT' and 'CHARACTER SET utf8mb3'
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8, CHARACTER SET DEFAULT;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8' and 'CHARACTER SET DEFAULT'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8, CHARACTER SET utf8;
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET DEFAULT;
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1, b VARCHAR(10) CHARACTER SET utf8);
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8' and 'CHARACTER SET latin1'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET DEFAULT;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8' and 'CHARACTER SET DEFAULT'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET utf8;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
-ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8'
+ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET latin1'
 DROP TABLE t1;
diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result
index ba91abca96f..db445838102 100644
--- a/mysql-test/main/ctype_eucjpms.result
+++ b/mysql-test/main/ctype_eucjpms.result
@@ -10565,70 +10565,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 8FAABC	Ģ
 Warnings:
-Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -10636,70 +10636,70 @@ code	a
 8FA9C3	ð
 8FABB9	ǵ
 Warnings:
-Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8mb3'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@@ -25786,70 +25786,70 @@ FEFC	EE8EA9
 FEFD	EE8EAA
 FEFE	EE8EAB
 Warnings:
-Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A1 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A2 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A3 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A4 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A5 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A6 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A7 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A8 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3A9 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AD to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AE to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3AF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BA to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BB to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BC to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BD to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BE to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3BF to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'eucjpms' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AD to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AE to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BA to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BB to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BC to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BD to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BE to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BF to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3DB to 'utf8mb3'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result
index 5bfcc7071f3..37b7e86543f 100644
--- a/mysql-test/main/ctype_euckr.result
+++ b/mysql-test/main/ctype_euckr.result
@@ -24725,70 +24725,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 A1CA	Å
 Warnings:
-Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -24821,70 +24821,70 @@ A8E5	ⓨ
 A8E6	ⓩ
 A9A2	đ
 Warnings:
-Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8mb3'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8mb3'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_filesystem.result b/mysql-test/main/ctype_filesystem.result
index b461cf2a1a4..512a0612fd3 100644
--- a/mysql-test/main/ctype_filesystem.result
+++ b/mysql-test/main/ctype_filesystem.result
@@ -7,5 +7,5 @@ Variable_name	Value
 character_set_filesystem	latin1
 SHOW VARIABLES like 'character_set_client';
 Variable_name	Value
-character_set_client	utf8
+character_set_client	utf8mb3
 SET CHARACTER SET default;
diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result
index d6066f82db9..42a837b37e1 100644
--- a/mysql-test/main/ctype_gb2312.result
+++ b/mysql-test/main/ctype_gb2312.result
@@ -753,70 +753,70 @@ A2FA	Ⅹ
 A2FB	Ⅺ
 A2FC	Ⅻ
 Warnings:
-Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -848,70 +848,70 @@ A8B8	ǜ
 A8B9	ü
 A8BA	ê
 Warnings:
-Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8mb3'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8mb3'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result
index 7b54794a884..23ca646da9a 100644
--- a/mysql-test/main/ctype_gbk.result
+++ b/mysql-test/main/ctype_gbk.result
@@ -789,70 +789,70 @@ code	a
 A2FB	Ⅺ
 A2FC	Ⅻ
 Warnings:
-Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -886,70 +886,70 @@ A8BA	ê
 A8BD	ń
 A8BE	ň
 Warnings:
-Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8mb3'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8mb3'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_gbk_export_import.result b/mysql-test/main/ctype_gbk_export_import.result
index d7d5aa98f02..0ade48ec58a 100644
--- a/mysql-test/main/ctype_gbk_export_import.result
+++ b/mysql-test/main/ctype_gbk_export_import.result
@@ -49,7 +49,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   `a1` text NOT NULL,
-  `a2` text CHARACTER SET utf8 NOT NULL,
+  `a2` text CHARACTER SET utf8mb3 NOT NULL,
   `b1` blob NOT NULL,
   `eol` text NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=gbk
diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index 68870bbeea8..7bc81462988 100644
--- a/mysql-test/main/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
@@ -3650,13 +3650,13 @@ EXPLAIN EXTENDED SELECT 'abcdó', _latin1'abcdó', _utf8'abcdó';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select 'abcdó' AS `abcdó`,_latin1'abcd\xC3\xB3' AS `abcdó`,_utf8'abcd\xC3\xB3' AS `abcdó`
+Note	1003	select 'abcdó' AS `abcdó`,_latin1'abcd\xC3\xB3' AS `abcdó`,_utf8mb3'abcd\xC3\xB3' AS `abcdó`
 SET NAMES latin1;
 EXPLAIN EXTENDED SELECT 'abcdó', _latin1'abcdó', _utf8'abcdó';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select 'abcdó' AS `abcdó`,_latin1'abcd\xC3\xB3' AS `abcdó`,_utf8'abcd\xC3\xB3' AS `abcd�`
+Note	1003	select 'abcdó' AS `abcdó`,_latin1'abcd\xC3\xB3' AS `abcdó`,_utf8mb3'abcd\xC3\xB3' AS `abcd�`
 #
 # End of 5.5 tests
 #
diff --git a/mysql-test/main/ctype_ldml.result b/mysql-test/main/ctype_ldml.result
index 22b7a316111..05b31a4ea70 100644
--- a/mysql-test/main/ctype_ldml.result
+++ b/mysql-test/main/ctype_ldml.result
@@ -6,9 +6,9 @@ set names utf8;
 show variables like 'character_sets_dir%';
 Variable_name	Value
 character_sets_dir	MYSQL_TEST_DIR/std_data/ldml/
-show collation like 'utf8_phone_ci';
+show collation like 'utf8mb3_phone_ci';
 Collation	Charset	Id	Default	Compiled	Sortlen
-utf8_phone_ci	utf8	352			8
+utf8mb3_phone_ci	utf8mb3	352			8
 CREATE TABLE t1 (
 name VARCHAR(64),
 phone VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_phone_ci
@@ -35,9 +35,9 @@ SELECT * FROM t1 WHERE phone='7 9 1 2 8 0 0 8 0 0 1';
 name	phone
 Bar	+7-912-800-80-01
 DROP TABLE t1;
-show collation like 'utf8_test_ci';
+show collation like 'utf8mb3_test_ci';
 Collation	Charset	Id	Default	Compiled	Sortlen
-utf8_test_ci	utf8	353			8
+utf8mb3_test_ci	utf8mb3	353			8
 create table t1 (c1 char(1) character set utf8 collate utf8_test_ci);
 insert into t1 values ('a');
 select * from t1 where c1='b';
@@ -470,34 +470,34 @@ latin1_test	latin1	331			1
 latin1_test2	latin1	332			1
 latin1_test2_cs	latin1	333			1
 latin1_swedish_nopad2_ci	latin1	334			1
-utf8_bengali_standard_ci	utf8	336			8
-utf8_bengali_traditional_ci	utf8	337			8
-utf8_implicit_weights_ci	utf8	338			8
-utf8_phone_ci	utf8	352			8
-utf8_test_ci	utf8	353			8
-utf8_5624_1	utf8	354			8
-utf8_5624_2	utf8	355			8
-utf8_5624_3	utf8	356			8
-utf8_5624_4	utf8	357			8
+utf8mb3_bengali_standard_ci	utf8mb3	336			8
+utf8mb3_bengali_traditional_ci	utf8mb3	337			8
+utf8mb3_implicit_weights_ci	utf8mb3	338			8
+utf8mb3_phone_ci	utf8mb3	352			8
+utf8mb3_test_ci	utf8mb3	353			8
+utf8mb3_5624_1	utf8mb3	354			8
+utf8mb3_5624_2	utf8mb3	355			8
+utf8mb3_5624_3	utf8mb3	356			8
+utf8mb3_5624_4	utf8mb3	357			8
 ucs2_test_ci	ucs2	358			8
 ucs2_vn_ci	ucs2	359			8
 ucs2_5624_1	ucs2	360			8
-utf8_5624_5	utf8	368			8
-utf8_5624_5_bad	utf8	369			8
-utf8_czech_test_w2	utf8	370			4
-utf8_czech_test_nopad_w2	utf8	371			4
-utf8_czech_test_bad_w2	utf8	372			4
+utf8mb3_5624_5	utf8mb3	368			8
+utf8mb3_5624_5_bad	utf8mb3	369			8
+utf8mb3_czech_test_w2	utf8mb3	370			4
+utf8mb3_czech_test_nopad_w2	utf8mb3	371			4
+utf8mb3_czech_test_bad_w2	utf8mb3	372			4
 utf32_test_ci	utf32	391			8
-utf8_maxuserid_ci	utf8	2047			8
+utf8mb3_maxuserid_ci	utf8mb3	2047			8
 show collation like '%test%';
 Collation	Charset	Id	Default	Compiled	Sortlen
 latin1_test	latin1	331			1
 latin1_test2	latin1	332			1
 latin1_test2_cs	latin1	333			1
-utf8_test_ci	utf8	353			8
-utf8_czech_test_w2	utf8	370			4
-utf8_czech_test_nopad_w2	utf8	371			4
-utf8_czech_test_bad_w2	utf8	372			4
+utf8mb3_test_ci	utf8mb3	353			8
+utf8mb3_czech_test_w2	utf8mb3	370			4
+utf8mb3_czech_test_nopad_w2	utf8mb3	371			4
+utf8mb3_czech_test_bad_w2	utf8mb3	372			4
 ucs2_test_ci	ucs2	358			8
 utf8mb4_test_ci	utf8mb4	326			8
 utf8mb4_test_400_ci	utf8mb4	328			8
@@ -524,9 +524,9 @@ a
 b
 DROP TABLE t1;
 SET NAMES utf8 COLLATE utf8_phone_ci;
-SHOW COLLATION LIKE 'utf8_phone_ci';
+show collation like 'utf8mb3_phone_ci';
 Collation	Charset	Id	Default	Compiled	Sortlen
-utf8_phone_ci	utf8	352			8
+utf8mb3_phone_ci	utf8mb3	352			8
 SET NAMES utf8;
 SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci));
 hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci))
diff --git a/mysql-test/main/ctype_ldml.test b/mysql-test/main/ctype_ldml.test
index 8baabdf2bcb..155e584935b 100644
--- a/mysql-test/main/ctype_ldml.test
+++ b/mysql-test/main/ctype_ldml.test
@@ -19,7 +19,7 @@ set names utf8;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 show variables like 'character_sets_dir%';
 
-show collation like 'utf8_phone_ci';
+show collation like 'utf8mb3_phone_ci';
 CREATE TABLE t1 (
  name VARCHAR(64),
  phone VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_phone_ci
@@ -35,7 +35,7 @@ SELECT * FROM t1 WHERE phone='79128008001';
 SELECT * FROM t1 WHERE phone='7 9 1 2 8 0 0 8 0 0 1';
 DROP TABLE t1;
 
-show collation like 'utf8_test_ci';
+show collation like 'utf8mb3_test_ci';
 create table t1 (c1 char(1) character set utf8 collate utf8_test_ci);
 insert into t1 values ('a');
 select * from t1 where c1='b';
@@ -204,7 +204,7 @@ DROP TABLE t1;
 # Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
 #
 SET NAMES utf8 COLLATE utf8_phone_ci;
-SHOW COLLATION LIKE 'utf8_phone_ci';
+show collation like 'utf8mb3_phone_ci';
 SET NAMES utf8;
 
 # make sure utf8mb4_test_400_ci is Unicode-4.0.0 based
diff --git a/mysql-test/main/ctype_many.result b/mysql-test/main/ctype_many.result
index 9def4fea80b..74a870da239 100644
--- a/mysql-test/main/ctype_many.result
+++ b/mysql-test/main/ctype_many.result
@@ -1721,11 +1721,11 @@ SELECT CHARSET(CONCAT(utf8, utf8mb4)) FROM t1;
 CHARSET(CONCAT(utf8, utf8mb4))
 utf8mb4
 SELECT CHARSET(CONCAT(utf8, ucs2)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf8, utf16)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf8, utf32)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf8mb4, utf8)) FROM t1;
 CHARSET(CONCAT(utf8mb4, utf8))
 utf8mb4
@@ -1736,7 +1736,7 @@ ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf16_
 SELECT CHARSET(CONCAT(utf8mb4, utf32)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(ucs2, utf8)) FROM t1;
-ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(ucs2, utf8mb4)) FROM t1;
 ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(ucs2, utf16)) FROM t1;
@@ -1744,7 +1744,7 @@ ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf16_gen
 SELECT CHARSET(CONCAT(ucs2, utf32)) FROM t1;
 ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf16, utf8)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf16, ucs2)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf16, utf8mb4)) FROM t1;
@@ -1752,7 +1752,7 @@ ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8mb4_
 SELECT CHARSET(CONCAT(utf16, utf32)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf32, utf8)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8mb3_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf32, ucs2)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf32, utf8mb4)) FROM t1;
diff --git a/mysql-test/main/ctype_mb.result b/mysql-test/main/ctype_mb.result
index 5b0291aa53c..50f7d17fef4 100644
--- a/mysql-test/main/ctype_mb.result
+++ b/mysql-test/main/ctype_mb.result
@@ -3,17 +3,17 @@ CREATE TABLE t1 SELECT _utf8'test' as c1, _utf8'тест' as c2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 NOT NULL,
-  `c2` varchar(4) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 NOT NULL,
+  `c2` varchar(4) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DELETE FROM t1;
 ALTER TABLE t1 ADD c3 CHAR(4) CHARACTER SET utf8;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 NOT NULL,
-  `c2` varchar(4) CHARACTER SET utf8 NOT NULL,
-  `c3` char(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 NOT NULL,
+  `c2` varchar(4) CHARACTER SET utf8mb3 NOT NULL,
+  `c3` char(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT IGNORE INTO t1 VALUES ('aaaabbbbccccdddd','aaaabbbbccccdddd','aaaabbbbccccdddd');
 Warnings:
@@ -28,7 +28,7 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8, KEY key_a(a(3)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
+  `a` char(4) CHARACTER SET utf8mb3 DEFAULT NULL,
   KEY `key_a` (`a`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW KEYS FROM t1;
@@ -48,7 +48,7 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
+  `a` char(4) CHARACTER SET utf8mb3 DEFAULT NULL,
   KEY `key_a` (`a`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW KEYS FROM t1;
diff --git a/mysql-test/main/ctype_recoding.result b/mysql-test/main/ctype_recoding.result
index 4668ddf9684..82e42f62782 100644
--- a/mysql-test/main/ctype_recoding.result
+++ b/mysql-test/main/ctype_recoding.result
@@ -162,10 +162,10 @@ Field	Type	Null	Key	Default	Extra
 DROP TABLE t1;
 SET NAMES binary;
 CREATE TABLE `good�����` (a int);
-ERROR HY000: Invalid utf8 character string: 'good\xD0\xCC\xCF\xC8\xCF'
+ERROR HY000: Invalid utf8mb3 character string: 'good\xD0\xCC\xCF\xC8\xCF'
 SET NAMES utf8;
 CREATE TABLE `good�����` (a int);
-ERROR HY000: Invalid utf8 character string: 'good\xD0\xCC\xCF\xC8\xCF'
+ERROR HY000: Invalid utf8mb3 character string: 'good\xD0\xCC\xCF\xC8\xCF'
 set names latin1;
 create table t1 (a char(10) character set koi8r, b text character set koi8r);
 insert into t1 values ('test','test');
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index 638f9bc21c7..36411914e86 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -674,139 +674,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 81F0	Å
 Warnings:
-Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 Warnings:
-Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8mb3'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@@ -7757,70 +7757,70 @@ EAA2	E791A4
 EAA3	E5879C
 EAA4	E78699
 Warnings:
-Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EB to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EC to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81ED to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EE to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81EF to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81F8 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81F9 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81FA to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x81FB to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8240 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8241 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8242 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8243 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8244 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8245 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8246 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8247 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8248 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8249 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x824A to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x824B to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x824C to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x824D to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x824E to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x8259 to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825A to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825B to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825C to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825D to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825E to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x825F to 'utf8'
-Warning	1977	Cannot convert 'sjis' character 0x827A to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EB to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EC to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81ED to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EE to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81EF to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81F8 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81F9 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81FA to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x81FB to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8240 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8241 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8242 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8243 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8244 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8245 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8246 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8247 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8248 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8249 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x824A to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x824B to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x824C to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x824D to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x824E to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x8259 to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825A to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825B to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825C to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825D to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825E to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x825F to 'utf8mb3'
+Warning	1977	Cannot convert 'sjis' character 0x827A to 'utf8mb3'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result
index d4b242d035f..279a3cdcd5d 100644
--- a/mysql-test/main/ctype_uca.result
+++ b/mysql-test/main/ctype_uca.result
@@ -6037,7 +6037,7 @@ USE d1;
 CREATE TABLE t1 (c CHAR(10), KEY(c));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	char(10)	utf8_swedish_ci	YES	MUL	NULL			
+c	char(10)	utf8mb3_swedish_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
 SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
 want3results
@@ -6048,7 +6048,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL			
+c1	varchar(15)	utf8mb3_swedish_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
 SELECT c1 as want3results from t1 where c1 like 'l%';
 want3results
@@ -6104,7 +6104,7 @@ SET character_set_connection= @test_character_set;
 SET collation_connection= @test_collation;
 SELECT COLLATION('.'), SUBSTRING_INDEX('.wwwmysqlcom', '.', -2) AS c1;
 COLLATION('.')	c1
-utf8_swedish_ci	.wwwmysqlcom
+utf8mb3_swedish_ci	.wwwmysqlcom
 set names utf8;
 create table t1 (
 name varchar(10),
@@ -6112,9 +6112,9 @@ level smallint unsigned);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `name` varchar(10) COLLATE utf8_swedish_ci DEFAULT NULL,
+  `name` varchar(10) COLLATE utf8mb3_swedish_ci DEFAULT NULL,
   `level` smallint(5) unsigned DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_swedish_ci
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
 concat(name,space(level))	concat(name, repeat(' ',level))
@@ -6143,16 +6143,16 @@ delete from t1;
 insert into t1 values ('a'), ('a '), ('a\t');
 select collation(a),hex(a) from t1 order by a;
 collation(a)	hex(a)
-utf8_unicode_ci	6109
-utf8_unicode_ci	61
-utf8_unicode_ci	6120
+utf8mb3_unicode_ci	6109
+utf8mb3_unicode_ci	61
+utf8mb3_unicode_ci	6120
 drop table t1;
 #
 # MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 CREATE TABLE t1 (i INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1),(2);
 SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
@@ -6169,7 +6169,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 CREATE TABLE t1 ENGINE=MEMORY AS SELECT REPEAT('a',5) AS a LIMIT 0;
 INSERT INTO t1 (a) VALUES ("a");
 INSERT INTO t1 (a) VALUES ("b");
@@ -6217,7 +6217,7 @@ a
 DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;
 insert into t1 values('abcdef');
 insert into t1 values('_bcdef');
@@ -6235,7 +6235,7 @@ ab_def
 drop table t1;
 SELECT @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 SELECT '\%b' LIKE '%\%';
 '\%b' LIKE '%\%'
 0
@@ -6244,7 +6244,7 @@ drop table if exists t1;
 create table t1 as select repeat(' ', 64) as s1;
 select collation(s1) from t1;
 collation(s1)
-utf8_unicode_ci
+utf8mb3_unicode_ci
 delete from t1;
 INSERT INTO t1 VALUES ('ud'),('uf');
 INSERT INTO t1 VALUES ('od'),('of');
@@ -6332,7 +6332,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a, 1 AS b LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `b` int(1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('s',0),(_latin1 0xDF,1);
@@ -6548,7 +6548,7 @@ End of 5.1 tests
 SET collation_connection=utf8_czech_ci;
 SELECT @@collation_connection;
 @@collation_connection
-utf8_czech_ci
+utf8mb3_czech_ci
 #
 # Bug#57737 Character sets: search fails with like, contraction, index
 #
@@ -6574,7 +6574,7 @@ ch
 DROP TABLE t1;
 SELECT @@collation_connection;
 @@collation_connection
-utf8_czech_ci
+utf8mb3_czech_ci
 #
 # Bug#57737 Character sets: search fails with like, contraction, index
 # Part#2 - ignorable characters
@@ -6740,7 +6740,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
@@ -6959,7 +6959,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
@@ -7424,12 +7424,12 @@ F6FDF6FD9FF1B5F1CCF1
 set @@collation_connection=utf8_unicode_ci;
 select @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 CREATE TABLE t1 AS SELECT 'a' AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL
+  `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -7449,7 +7449,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(5) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -7565,7 +7565,7 @@ hex(weight_string('abc',25, 4, 0xC0))
 0E330E4A0E6002090209020902090209020902090209020902
 select @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 select hex(weight_string(cast(_latin1 0x80 as char)));
 hex(weight_string(cast(_latin1 0x80 as char)))
 0E23
@@ -7637,7 +7637,7 @@ hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0))
 0E230E230E2302090209020902090209020902090209020902
 select @@collation_connection;
 @@collation_connection
-utf8_unicode_ci
+utf8mb3_unicode_ci
 select hex(weight_string('a' LEVEL 1));
 hex(weight_string('a' LEVEL 1))
 0E33
@@ -7668,10 +7668,10 @@ F6FDF6FD9FF1B5F1CCF1
 set @@collation_connection=utf8_czech_ci;
 select @@collation_connection;
 @@collation_connection
-utf8_czech_ci
+utf8mb3_czech_ci
 select collation(cast(_latin1 0xDF as char));
 collation(cast(_latin1 0xDF as char))
-utf8_czech_ci
+utf8mb3_czech_ci
 select hex(weight_string('s'));
 hex(weight_string('s'))
 0FEA
@@ -7987,7 +7987,7 @@ drop table if exists t1;
 create table t1 as select repeat(' ', 64) as s1;
 select collation(s1) from t1;
 collation(s1)
-utf8_german2_ci
+utf8mb3_german2_ci
 delete from t1;
 INSERT INTO t1 VALUES ('ud'),('uf');
 INSERT INTO t1 VALUES ('od'),('of');
@@ -8077,7 +8077,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a, 1 AS b LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL,
+  `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL,
   `b` int(1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('s',0),(_latin1 0xDF,1);
@@ -8411,7 +8411,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE CONCAT(c1)='a';
@@ -8434,7 +8434,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE 'a'=CONCAT(c1);
@@ -8457,7 +8457,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '% '=CONCAT(c1);
@@ -8480,7 +8480,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '%'=CONCAT(c1);
@@ -8506,7 +8506,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ';
@@ -8531,7 +8531,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('ae'),('ä');
 SELECT * FROM t1 WHERE c1='ä';
@@ -8569,7 +8569,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE CONCAT(c1)='a';
@@ -8592,7 +8592,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE 'a'=CONCAT(c1);
@@ -8615,7 +8615,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '% '=CONCAT(c1);
@@ -8638,7 +8638,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '%'=CONCAT(c1);
@@ -8664,7 +8664,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ';
@@ -8689,7 +8689,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_german2_ci DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('ae'),('ä');
 SELECT * FROM t1 WHERE c1='ä';
@@ -8732,7 +8732,7 @@ SET NAMES utf8 COLLATE utf8_myanmar_ci;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_myanmar_ci
+utf8mb3_myanmar_ci
 CREATE TABLE t1 AS SELECT 100000 AS id, REPEAT(' ', 64) AS s1 LIMIT 0;
 SELECT COLLATION(s1) FROM t1;
 COLLATION(s1)
@@ -8742,7 +8742,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `s1` varchar(64) CHARACTER SET utf8 COLLATE utf8_myanmar_ci DEFAULT NULL,
+  `s1` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_myanmar_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 (s1) VALUES
@@ -13966,12 +13966,12 @@ SET NAMES utf8 COLLATE utf8_thai_520_w2;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_thai_520_w2
+utf8mb3_thai_520_w2
 SELECT ID, SORTLEN, COLLATION_NAME, CHARACTER_SET_NAME
 FROM INFORMATION_SCHEMA.COLLATIONS
 WHERE COLLATION_NAME LIKE @@collation_connection;
 ID	SORTLEN	COLLATION_NAME	CHARACTER_SET_NAME
-578	4	utf8_thai_520_w2	utf8
+578	4	utf8mb3_thai_520_w2	utf8mb3
 #
 # Testing strnxfrm
 #
@@ -13979,7 +13979,7 @@ CREATE TABLE t1 AS SELECT SPACE(3) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(3) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `a` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (SPACE(0)),(SPACE(1)),(SPACE(2));
 SELECT HEX(a), HEX(WEIGHT_STRING(a AS CHAR(8))) FROM t1;
@@ -14012,7 +14012,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (_ucs2 0x3400);
 INSERT INTO t1 VALUES (_ucs2 0xF001);
@@ -14025,7 +14025,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('A'),('À'),('Á'),('Â'),('Ã'),('Ä'),('Å');
 SELECT a, HEX(WEIGHT_STRING(a LEVEL 2)) FROM t1 ORDER BY a;
@@ -14059,7 +14059,7 @@ SET collation_connection=@backup_collation_connection;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `a` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT a, HEX(WEIGHT_STRING(a LEVEL 2)) FROM t1 ORDER BY a;
 a	HEX(WEIGHT_STRING(a LEVEL 2))
@@ -14084,7 +14084,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('cota'),('cote'),('cotz');
 INSERT INTO t1 VALUES ('coté'),('côte'),('côté'),('cotë'),('côtë');
@@ -14228,7 +14228,7 @@ SET collation_connection=@backup_collation_connection;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(30) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL,
+  `a` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `a_id` (`a`,`id`)
diff --git a/mysql-test/main/ctype_uca_innodb.result b/mysql-test/main/ctype_uca_innodb.result
index 7c64f17190e..2f46a140c83 100644
--- a/mysql-test/main/ctype_uca_innodb.result
+++ b/mysql-test/main/ctype_uca_innodb.result
@@ -15,7 +15,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
diff --git a/mysql-test/main/ctype_uca_innodb.test b/mysql-test/main/ctype_uca_innodb.test
index cb6caff4a03..3582740d60e 100644
--- a/mysql-test/main/ctype_uca_innodb.test
+++ b/mysql-test/main/ctype_uca_innodb.test
@@ -2,7 +2,7 @@
 # Tests for UCA collations with InnoDB
 #
 
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 --source include/have_innodb.inc
 
diff --git a/mysql-test/main/ctype_uca_partitions.result b/mysql-test/main/ctype_uca_partitions.result
index 154de148ee0..36d102e3afd 100644
--- a/mysql-test/main/ctype_uca_partitions.result
+++ b/mysql-test/main/ctype_uca_partitions.result
@@ -4,7 +4,7 @@ PARTITION BY KEY(c1) PARTITIONS 3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
  PARTITION BY KEY (`c1`)
 PARTITIONS 3
diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result
index c20455813d3..8895770191d 100644
--- a/mysql-test/main/ctype_ujis.result
+++ b/mysql-test/main/ctype_ujis.result
@@ -3073,70 +3073,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 8FAABC	Ģ
 Warnings:
-Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8mb3'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@@ -3144,70 +3144,70 @@ code	a
 8FA9C3	ð
 8FABB9	ǵ
 Warnings:
-Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8mb3'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@@ -18105,70 +18105,70 @@ FEFC	EE8EA9
 FEFD	EE8EAA
 FEFE	EE8EAB
 Warnings:
-Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2ED to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EE to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2EF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2F0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2F1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2FA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2FB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2FC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA2FD to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A1 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A2 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A3 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A4 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A5 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A6 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A7 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A8 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3A9 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AD to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AE to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3AF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BA to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BB to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BC to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BD to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BE to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3BF to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3C0 to 'utf8'
-Warning	1977	Cannot convert 'ujis' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2ED to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EE to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2EF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2F0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2F1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2FA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2FB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2FC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA2FD to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A1 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A2 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A3 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A4 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A5 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A6 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A7 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A8 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3A9 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AD to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AE to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3AF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BA to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BB to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BC to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BD to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BE to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3BF to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3C0 to 'utf8mb3'
+Warning	1977	Cannot convert 'ujis' character 0xA3DB to 'utf8mb3'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
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
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index 266292edab6..c3af1b57194 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -127,7 +127,7 @@ create table t1 select date_format("2004-01-19 10:10:10", "%Y-%m-%d");
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 date_format("2004-01-19 10:10:10", "%Y-%m-%d")
@@ -279,8 +279,8 @@ select null, null;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `s1` varchar(64) CHARACTER SET utf8 DEFAULT NULL,
-  `s2` varchar(64) CHARACTER SET utf8 DEFAULT NULL
+  `s1` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `s2` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 delete from t1;
 insert into t1 values('aaa','aaa');
@@ -316,7 +316,7 @@ NULL
 drop table t1;
 SELECT @@character_set_client, @@collation_connection;
 @@character_set_client	@@collation_connection
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 select  'вася'  rlike '\\bвася\\b';
 'вася'  rlike '\\bвася\\b'
 1
@@ -367,7 +367,7 @@ create table t1 (a enum('aaaa','проба') character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('aaaa','проба') CHARACTER SET utf8 DEFAULT NULL
+  `a` enum('aaaa','проба') CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('проба');
 select * from t1;
@@ -377,7 +377,7 @@ create table t2 select ifnull(a,a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ifnull(a,a)` varchar(5) CHARACTER SET utf8 DEFAULT NULL
+  `ifnull(a,a)` varchar(5) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t2;
 ifnull(a,a)
@@ -503,7 +503,7 @@ unique key a using hash (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,
+  `c` char(10) CHARACTER SET utf8mb3 DEFAULT NULL,
   UNIQUE KEY `a` (`c`(1)) USING HASH
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -539,7 +539,7 @@ unique key a using btree (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,
+  `c` char(10) CHARACTER SET utf8mb3 DEFAULT NULL,
   UNIQUE KEY `a` (`c`(1)) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -661,7 +661,7 @@ unique key a using hash (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   UNIQUE KEY `a` (`c`(1)) USING HASH
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -697,7 +697,7 @@ unique key a using btree (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `c` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   UNIQUE KEY `a` (`c`(1)) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -901,8 +901,8 @@ create table t2 select concat(a,_utf8'') as a, concat(b,_utf8'')as b from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(5) CHARACTER SET utf8 DEFAULT NULL,
-  `b` varchar(15) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(5) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `b` varchar(15) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2;
 drop table t1;
@@ -942,16 +942,16 @@ delete from t1;
 insert into t1 values ('a'), ('a '), ('a\t');
 select collation(a),hex(a) from t1 order by a;
 collation(a)	hex(a)
-utf8_general_ci	6109
-utf8_general_ci	61
-utf8_general_ci	6120
+utf8mb3_general_ci	6109
+utf8mb3_general_ci	61
+utf8mb3_general_ci	6120
 drop table t1;
 #
 # MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE TABLE t1 (i INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1),(2);
 SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
@@ -968,7 +968,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE TABLE t1 ENGINE=MEMORY AS SELECT REPEAT('a',5) AS a LIMIT 0;
 INSERT INTO t1 (a) VALUES ("a");
 INSERT INTO t1 (a) VALUES ("b");
@@ -1016,7 +1016,7 @@ a
 DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;
 insert into t1 values('abcdef');
 insert into t1 values('_bcdef');
@@ -1034,7 +1034,7 @@ ab_def
 drop table t1;
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 SELECT '\%b' LIKE '%\%';
 '\%b' LIKE '%\%'
 0
@@ -1043,7 +1043,7 @@ drop table if exists t1;
 create table t1 as select repeat(' ', 64) as s1;
 select collation(s1) from t1;
 collation(s1)
-utf8_general_ci
+utf8mb3_general_ci
 delete from t1;
 INSERT INTO t1 VALUES ('ud'),('uf');
 INSERT INTO t1 VALUES ('od'),('of');
@@ -1132,7 +1132,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a, 1 AS b LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
+  `a` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
   `b` int(1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('s',0),(_latin1 0xDF,1);
@@ -1159,7 +1159,7 @@ DROP TABLE t1;
 #
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
 @@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
-utf8	C3B7
+utf8mb3	C3B7
 SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
 STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
 2001-01-01
@@ -1179,16 +1179,16 @@ delete from t1;
 insert into t1 values ('a'), ('a '), ('a\t');
 select collation(a),hex(a) from t1 order by a;
 collation(a)	hex(a)
-utf8_bin	6109
-utf8_bin	61
-utf8_bin	6120
+utf8mb3_bin	6109
+utf8mb3_bin	61
+utf8mb3_bin	6120
 drop table t1;
 #
 # MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 CREATE TABLE t1 (i INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1),(2);
 SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
@@ -1205,7 +1205,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 CREATE TABLE t1 ENGINE=MEMORY AS SELECT REPEAT('a',5) AS a LIMIT 0;
 INSERT INTO t1 (a) VALUES ("a");
 INSERT INTO t1 (a) VALUES ("b");
@@ -1253,7 +1253,7 @@ a
 DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;
 insert into t1 values('abcdef');
 insert into t1 values('_bcdef');
@@ -1271,7 +1271,7 @@ ab_def
 drop table t1;
 SELECT @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 SELECT '\%b' LIKE '%\%';
 '\%b' LIKE '%\%'
 0
@@ -1281,7 +1281,7 @@ user varchar(255) NOT NULL default ''
 INSERT INTO t1 VALUES ('one'),('two');
 SELECT CHARSET('a');
 CHARSET('a')
-utf8
+utf8mb3
 SELECT user, CONCAT('<', user, '>') AS c FROM t1;
 user	c
 one	<one>
@@ -1818,13 +1818,13 @@ drop table t1;
 SET CHARACTER SET utf8;
 SHOW VARIABLES LIKE 'character\_set\_%';
 Variable_name	Value
-character_set_client	utf8
+character_set_client	utf8mb3
 character_set_connection	latin1
 character_set_database	latin1
 character_set_filesystem	binary
-character_set_results	utf8
+character_set_results	utf8mb3
 character_set_server	latin1
-character_set_system	utf8
+character_set_system	utf8mb3
 CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 USE crashtest;
 CREATE TABLE crashtest (crash char(10)) DEFAULT CHARSET=utf8;
@@ -1845,7 +1845,7 @@ crash
 36
 37
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FFFFFC'
+Warning	1300	Invalid utf8mb3 character string: 'FFFFFC'
 DROP TABLE crashtest;
 DROP DATABASE crashtest;
 USE test;
@@ -1934,38 +1934,38 @@ select char(0xff,0x8f using utf8);
 char(0xff,0x8f using utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF8F'
+Warning	1300	Invalid utf8mb3 character string: 'FF8F'
 select convert(char(0xff,0x8f) using utf8);
 convert(char(0xff,0x8f) using utf8)
 ??
 Warnings:
-Warning	1300	Invalid utf8 character string: '\xFF\x8F'
+Warning	1300	Invalid utf8mb3 character string: '\xFF\x8F'
 set sql_mode=traditional;
 select char(0xff,0x8f using utf8);
 char(0xff,0x8f using utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF8F'
+Warning	1300	Invalid utf8mb3 character string: 'FF8F'
 select char(195 using utf8);
 char(195 using utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'C3'
+Warning	1300	Invalid utf8mb3 character string: 'C3'
 select char(196 using utf8);
 char(196 using utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'C4'
+Warning	1300	Invalid utf8mb3 character string: 'C4'
 select char(2557 using utf8);
 char(2557 using utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FD'
+Warning	1300	Invalid utf8mb3 character string: 'FD'
 select convert(char(0xff,0x8f) using utf8);
 convert(char(0xff,0x8f) using utf8)
 ??
 Warnings:
-Warning	1300	Invalid utf8 character string: '\xFF\x8F'
+Warning	1300	Invalid utf8mb3 character string: '\xFF\x8F'
 select hex(convert(char(2557 using latin1) using utf8));
 hex(convert(char(2557 using latin1) using utf8))
 09C3BD
@@ -2015,22 +2015,22 @@ insert into t1 values('t1_val');
 create view v1 as select 'v1_val' as col1;
 select coercibility(col1), collation(col1) from v1;
 coercibility(col1)	collation(col1)
-4	utf8_general_ci
+4	utf8mb3_general_ci
 create view v2 as select col1 from v1 union select col1 from t1;
 select coercibility(col1), collation(col1)from v2;
 coercibility(col1)	collation(col1)
-2	utf8_unicode_ci
-2	utf8_unicode_ci
+2	utf8mb3_unicode_ci
+2	utf8mb3_unicode_ci
 drop view v1, v2;
 create view v1 as select 'v1_val' collate utf8_swedish_ci as col1;
 select coercibility(col1), collation(col1) from v1;
 coercibility(col1)	collation(col1)
-0	utf8_swedish_ci
+0	utf8mb3_swedish_ci
 create view v2 as select col1 from v1 union select col1 from t1;
 select coercibility(col1), collation(col1) from v2;
 coercibility(col1)	collation(col1)
-0	utf8_swedish_ci
-0	utf8_swedish_ci
+0	utf8mb3_swedish_ci
+0	utf8mb3_swedish_ci
 drop view v1, v2;
 drop table t1;
 set names utf8;
@@ -2040,7 +2040,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1;
 concat(a, if(b>10, N'x', N'y'))
 ay
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8;
 create table t1 (a varchar(10) character set latin1, b int);
@@ -2049,7 +2049,7 @@ select concat(a, if(b>10, _utf8'x', _utf8'y')) from t1;
 concat(a, if(b>10, _utf8'x', _utf8'y'))
 ay
 select concat(a, if(b>10, _utf8'æ', _utf8'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8;
 create table t1 (a varchar(10) character set latin1, b int);
@@ -2058,7 +2058,7 @@ select concat(a, if(b>10, _utf8 0x78, _utf8 0x79)) from t1;
 concat(a, if(b>10, _utf8 0x78, _utf8 0x79))
 ay
 select concat(a, if(b>10, _utf8 0xC3A6, _utf8 0xC3AF)) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8;
 create table t1 (a varchar(10) character set latin1, b int);
@@ -2067,7 +2067,7 @@ select concat(a, if(b>10, 'x' 'x', 'y' 'y')) from t1;
 concat(a, if(b>10, 'x' 'x', 'y' 'y'))
 ayy
 select concat(a, if(b>10, 'x' 'æ', 'y' 'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 CREATE TABLE t1 (
 colA int(11) NOT NULL,
@@ -2129,39 +2129,39 @@ select hex(char(0xFF using utf8));
 hex(char(0xFF using utf8))
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF'
+Warning	1300	Invalid utf8mb3 character string: 'FF'
 select hex(convert(0xFF using utf8));
 hex(convert(0xFF using utf8))
 3F
 Warnings:
-Warning	1300	Invalid utf8 character string: '\xFF'
+Warning	1300	Invalid utf8mb3 character string: '\xFF'
 select hex(_utf8 0x616263FF);
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select hex(_utf8 X'616263FF');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select hex(_utf8 B'001111111111');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select (_utf8 X'616263FF');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 set sql_mode=default;
 select hex(char(0xFF using utf8));
 hex(char(0xFF using utf8))
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF'
+Warning	1300	Invalid utf8mb3 character string: 'FF'
 select hex(convert(0xFF using utf8));
 hex(convert(0xFF using utf8))
 3F
 Warnings:
-Warning	1300	Invalid utf8 character string: '\xFF'
+Warning	1300	Invalid utf8mb3 character string: '\xFF'
 select hex(_utf8 0x616263FF);
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select hex(_utf8 X'616263FF');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select hex(_utf8 B'001111111111');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 select (_utf8 X'616263FF');
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 #
 # Bug#44131 Binary-mode "order by" returns records in incorrect order for UTF-8 strings
 #
@@ -2271,12 +2271,12 @@ Start of 5.4 tests
 SET NAMES utf8mb3;
 SHOW VARIABLES LIKE 'character_set_results%';
 Variable_name	Value
-character_set_results	utf8
+character_set_results	utf8mb3
 CREATE TABLE t1 (a CHAR CHARACTER SET utf8mb3 COLLATE utf8mb3_bin);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `a` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SELECT _utf8mb3'test';
@@ -2297,7 +2297,7 @@ t1	CREATE TABLE `t1` (
   `Tape` tinytext DEFAULT NULL,
   PRIMARY KEY (`clipid`),
   KEY `tape` (`Tape`(255))
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -2467,7 +2467,7 @@ CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `CONCAT(s1)` varchar(255) CHARACTER SET utf8 DEFAULT NULL
+  `CONCAT(s1)` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, t2;
 SET NAMES utf8;
@@ -2482,7 +2482,7 @@ create table t1 as select concat(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select hex(c1) from t1;
 hex(c1)
@@ -2495,7 +2495,7 @@ create table t1 as select concat(18446744073709551615) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select hex(c1) from t1;
 hex(c1)
@@ -2508,7 +2508,7 @@ create table t1 as select concat(1.1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select hex(c1) from t1;
 hex(c1)
@@ -2516,12 +2516,12 @@ hex(c1)
 drop table t1;
 select hex(concat('a', 1+2)), charset(concat(1+2));
 hex(concat('a', 1+2))	charset(concat(1+2))
-6133	utf8
+6133	utf8mb3
 create table t1 as select concat(1+2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1-2));
@@ -2531,7 +2531,7 @@ create table t1 as select concat(1-2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1*2));
@@ -2541,7 +2541,7 @@ create table t1 as select concat(1*2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1/2));
@@ -2551,7 +2551,7 @@ create table t1 as select concat(1/2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(7) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(7) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1 div 2));
@@ -2561,7 +2561,7 @@ create table t1 as select concat(1 div 2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1 % 2));
@@ -2571,7 +2571,7 @@ create table t1 as select concat(1 % 2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(-1));
@@ -2581,7 +2581,7 @@ create table t1 as select concat(-1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(-(1+2)));
@@ -2591,7 +2591,7 @@ create table t1 as select concat(-(1+2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1|2));
@@ -2601,7 +2601,7 @@ create table t1 as select concat(1|2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(1&2));
@@ -2611,7 +2611,7 @@ create table t1 as select concat(1&2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(bit_count(12)));
@@ -2621,7 +2621,7 @@ create table t1 as select concat(bit_count(12)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(2<<1));
@@ -2631,7 +2631,7 @@ create table t1 as select concat(2<<1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(2>>1));
@@ -2641,7 +2641,7 @@ create table t1 as select concat(2>>1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(~0));
@@ -2651,7 +2651,7 @@ create table t1 as select concat(~0) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(3^2));
@@ -2661,7 +2661,7 @@ create table t1 as select concat(3^2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(abs(-2)));
@@ -2671,7 +2671,7 @@ create table t1 as select concat(abs(-2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(exp(2)),1));
@@ -2681,7 +2681,7 @@ create table t1 as select concat(exp(2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(log(2)),1));
@@ -2691,7 +2691,7 @@ create table t1 as select concat(log(2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(log2(2)),1));
@@ -2701,7 +2701,7 @@ create table t1 as select concat(log2(2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(log10(2)),1));
@@ -2711,7 +2711,7 @@ create table t1 as select concat(log10(2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(sqrt(2)),1));
@@ -2721,7 +2721,7 @@ create table t1 as select concat(sqrt(2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(pow(2,2)),1));
@@ -2731,7 +2731,7 @@ create table t1 as select concat(pow(2,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(acos(0.5)),1));
@@ -2741,7 +2741,7 @@ create table t1 as select concat(acos(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(asin(0.5)),1));
@@ -2751,7 +2751,7 @@ create table t1 as select concat(asin(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(atan(0.5)),1));
@@ -2761,7 +2761,7 @@ create table t1 as select concat(atan(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(cos(0.5)),1));
@@ -2771,7 +2771,7 @@ create table t1 as select concat(cos(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(sin(0.5)),1));
@@ -2781,7 +2781,7 @@ create table t1 as select concat(sin(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(tan(0.5)),1));
@@ -2791,7 +2791,7 @@ create table t1 as select concat(tan(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(degrees(0)));
@@ -2801,7 +2801,7 @@ create table t1 as select concat(degrees(0)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(radians(0)));
@@ -2811,7 +2811,7 @@ create table t1 as select concat(radians(0)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(ceiling(0.5)));
@@ -2822,7 +2822,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c0` int(3) NOT NULL,
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(floor(0.5)));
@@ -2833,7 +2833,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c0` int(3) NOT NULL,
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(round(0.5)));
@@ -2843,7 +2843,7 @@ create table t1 as select concat(round(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(sign(0.5)));
@@ -2853,14 +2853,14 @@ create table t1 as select concat(sign(0.5)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(rand()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(length('a')));
@@ -2870,7 +2870,7 @@ create table t1 as select concat(length('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(char_length('a')));
@@ -2880,7 +2880,7 @@ create table t1 as select concat(char_length('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(bit_length('a')));
@@ -2890,7 +2890,7 @@ create table t1 as select concat(bit_length('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(11) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(11) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(coercibility('a')));
@@ -2900,7 +2900,7 @@ create table t1 as select concat(coercibility('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(locate('a','a')));
@@ -2910,7 +2910,7 @@ create table t1 as select concat(locate('a','a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(11) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(11) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(field('c','a','b','c')));
@@ -2920,7 +2920,7 @@ create table t1 as select concat(field('c','a','b','c')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(ascii(61)));
@@ -2930,7 +2930,7 @@ create table t1 as select concat(ascii(61)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(ord(61)));
@@ -2940,7 +2940,7 @@ create table t1 as select concat(ord(61)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(7) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(7) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(find_in_set('b','a,b,c,d')));
@@ -2950,7 +2950,7 @@ create table t1 as select concat(find_in_set('b','a,b,c,d')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select md5('a'), hex(md5('a'));
@@ -2960,7 +2960,7 @@ create table t1 as select md5('a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(32) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(32) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select old_password('a'), hex(old_password('a'));
@@ -2970,7 +2970,7 @@ create table t1 as select old_password('a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(16) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(16) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select password('a'), hex(password('a'));
@@ -2980,7 +2980,7 @@ create table t1 as select password('a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(41) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(41) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select sha('a'), hex(sha('a'));
@@ -2990,7 +2990,7 @@ create table t1 as select sha('a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(40) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select sha1('a'), hex(sha1('a'));
@@ -3000,7 +3000,7 @@ create table t1 as select sha1('a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(40) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(cast('-1' as signed)));
@@ -3010,7 +3010,7 @@ create table t1 as select concat(cast('-1' as signed)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(cast('1' as unsigned)));
@@ -3020,7 +3020,7 @@ create table t1 as select concat(cast('1' as unsigned)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(cast(1/2 as decimal(5,5))));
@@ -3030,7 +3030,7 @@ create table t1 as select concat(cast(1/2 as decimal(5,5))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(7) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(7) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(cast('2001-01-02 03:04:05' as date)));
@@ -3040,7 +3040,7 @@ create table t1 as select concat(cast('2001-01-02 03:04:05' as date)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 c1
@@ -3053,7 +3053,7 @@ create table t1 as select concat(cast('2001-01-02 03:04:05' as time)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 c1
@@ -3066,7 +3066,7 @@ create table t1 as select concat(cast('2001-01-02' as datetime)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 c1
@@ -3079,7 +3079,7 @@ create table t1 as select concat(least(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(greatest(1,2)));
@@ -3089,7 +3089,7 @@ create table t1 as select concat(greatest(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(case when 11 then 22 else 33 end));
@@ -3099,7 +3099,7 @@ create table t1 as select concat(case when 11 then 22 else 33 end) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(coalesce(1,2)));
@@ -3109,7 +3109,7 @@ create table t1 as select concat(coalesce(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat_ws(1,2,3));
@@ -3119,7 +3119,7 @@ create table t1 as select concat_ws(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(group_concat(1,2,3));
@@ -3129,14 +3129,14 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 NOT NULL DEFAULT ''
+  `c1` varchar(1) CHARACTER SET utf8mb3 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select hex(c1) from t1 order by c1;
 hex(c1)
@@ -3147,7 +3147,7 @@ create table t1 as select concat(last_insert_id()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(benchmark(0,0)));
@@ -3157,7 +3157,7 @@ create table t1 as select concat(benchmark(0,0)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(sleep(0)));
@@ -3167,7 +3167,7 @@ create table t1 as select concat(sleep(0)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(is_free_lock('xxxx')));
@@ -3177,21 +3177,21 @@ create table t1 as select concat(is_free_lock('xxxx')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(is_used_lock('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(release_lock('a')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(crc32('')));
@@ -3201,7 +3201,7 @@ create table t1 as select concat(crc32('')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(uncompressed_length('')));
@@ -3211,14 +3211,14 @@ create table t1 as select concat(uncompressed_length('')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(connection_id()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_aton('127.1.1.1')));
@@ -3228,7 +3228,7 @@ create table t1 as select concat(inet_aton('127.1.1.1')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(inet_ntoa(2130772225)));
@@ -3241,7 +3241,7 @@ c1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(31) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(31) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select 1;
@@ -3254,7 +3254,7 @@ create table t1 as select concat(row_count()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(found_rows()));
@@ -3264,21 +3264,21 @@ create table t1 as select concat(found_rows()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(uuid_short()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(uuid()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(36) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(36) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select coercibility(uuid()), coercibility(cast('a' as char character set latin1));
@@ -3298,7 +3298,7 @@ create table t1 as select concat(master_pos_wait('non-existent',0,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(@a1:=1));
@@ -3311,7 +3311,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` int(1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3326,7 +3326,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` bigint(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3340,7 +3340,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3355,7 +3355,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3369,7 +3369,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` decimal(2,1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3384,7 +3384,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(83) CHARACTER SET utf8 DEFAULT NULL,
+  `c1` varchar(83) CHARACTER SET utf8mb3 DEFAULT NULL,
   `c2` decimal(65,38) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -3398,7 +3398,7 @@ hex(c1)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a'='a' IS TRUE));
@@ -3408,7 +3408,7 @@ create table t1 as select concat('a'='a' IS TRUE) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a'='a' IS NOT TRUE));
@@ -3418,7 +3418,7 @@ create table t1 as select concat('a'='a' IS NOT TRUE) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(NOT 'a'='a'));
@@ -3428,7 +3428,7 @@ create table t1 as select concat(NOT 'a'='a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' IS NULL));
@@ -3438,7 +3438,7 @@ create table t1 as select concat('a' IS NULL) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' IS NOT NULL));
@@ -3448,7 +3448,7 @@ create table t1 as select concat('a' IS NOT NULL) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' rlike 'a'));
@@ -3458,7 +3458,7 @@ create table t1 as select concat('a' IS NOT NULL) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(strcmp('a','b')));
@@ -3468,7 +3468,7 @@ create table t1 as select concat(strcmp('a','b')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' like 'a'));
@@ -3478,7 +3478,7 @@ create table t1 as select concat('a' like 'b') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' between 'b' and 'c'));
@@ -3488,7 +3488,7 @@ create table t1 as select concat('a' between 'b' and 'c') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat('a' in ('a','b')));
@@ -3498,7 +3498,7 @@ create table t1 as select concat('a' in ('a','b')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(interval(23, 1, 15, 17, 30, 44, 200)));
@@ -3508,7 +3508,7 @@ create table t1 as select concat(interval(23, 1, 15, 17, 30, 44, 200)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a varchar(10), fulltext key(a));
@@ -3520,7 +3520,7 @@ create table t2 as select concat(match (a) against ('a')) as a from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 select hex(ifnull(1,'a'));
@@ -3530,7 +3530,7 @@ create table t1 as select ifnull(1,'a') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(ifnull(1,1)));
@@ -3540,7 +3540,7 @@ create table t1 as select concat(ifnull(1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(ifnull(1.1,1.1)));
@@ -3550,7 +3550,7 @@ create table t1 as select concat(ifnull(1.1,1.1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(if(1,'b',1));
@@ -3560,7 +3560,7 @@ create table t1 as select if(1,'b',1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(if(1,1,'b'));
@@ -3570,7 +3570,7 @@ create table t1 as select if(1,1,'b') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(if(1,1,1)));
@@ -3580,7 +3580,7 @@ create table t1 as select concat(if(1,1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(nullif(1,2)));
@@ -3590,7 +3590,7 @@ create table t1 as select concat(nullif(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(Dimension(GeomFromText('LINESTRING(0 0,10 10)'))));
@@ -3600,7 +3600,7 @@ create table t1 as select concat(Dimension(GeomFromText('LINSTRING(0 0,10 10)'))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
@@ -3610,7 +3610,7 @@ create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
@@ -3620,7 +3620,7 @@ create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
@@ -3630,7 +3630,7 @@ create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
@@ -3640,7 +3640,7 @@ create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
@@ -3650,7 +3650,7 @@ create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(21) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
@@ -3660,7 +3660,7 @@ create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
@@ -3670,7 +3670,7 @@ create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
@@ -3685,7 +3685,7 @@ create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(y(GeomFromText('Point(1 2)'))));
@@ -3695,7 +3695,7 @@ create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
@@ -3705,7 +3705,7 @@ create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)')))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
@@ -3715,7 +3715,7 @@ create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(23) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(23) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
@@ -3725,7 +3725,7 @@ create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(AsText(GeomFromText('Point(1 2)'))));
@@ -3735,7 +3735,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));
@@ -3745,7 +3745,7 @@ create table t1 as select concat(period_add(200902, 2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_diff(200902, 200802)));
@@ -3758,7 +3758,7 @@ Warning	1265	Data truncated for column 'c1' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(to_days(20090224)));
@@ -3768,7 +3768,7 @@ create table t1 as select concat(to_days(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(dayofmonth(20090224)));
@@ -3778,7 +3778,7 @@ create table t1 as select concat(dayofmonth(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(dayofyear(20090224)));
@@ -3788,7 +3788,7 @@ create table t1 as select concat(dayofyear(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(hour('10:11:12')));
@@ -3798,7 +3798,7 @@ create table t1 as select concat(hour('10:11:12')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(minute('10:11:12')));
@@ -3808,7 +3808,7 @@ create table t1 as select concat(minute('10:11:12')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(second('10:11:12')));
@@ -3818,7 +3818,7 @@ create table t1 as select concat(second('10:11:12')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(quarter(20090224)));
@@ -3828,7 +3828,7 @@ create table t1 as select concat(quarter(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(week(20090224)));
@@ -3838,7 +3838,7 @@ create table t1 as select concat(week(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(yearweek(20090224)));
@@ -3848,7 +3848,7 @@ create table t1 as select concat(yearweek(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(year(20090224)));
@@ -3858,7 +3858,7 @@ create table t1 as select concat(year(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(weekday(20090224)));
@@ -3868,7 +3868,7 @@ create table t1 as select concat(weekday(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(dayofweek(20090224)));
@@ -3878,7 +3878,7 @@ create table t1 as select concat(dayofweek(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(unix_timestamp(20090224)));
@@ -3888,7 +3888,7 @@ create table t1 as select concat(unix_timestamp(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(17) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(17) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(time_to_sec('10:11:12')));
@@ -3898,7 +3898,7 @@ create table t1 as select concat(time_to_sec('10:11:12')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(17) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(17) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(extract(year from 20090702)));
@@ -3908,7 +3908,7 @@ create table t1 as select concat(extract(year from 20090702)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(microsecond('12:00:00.123456')));
@@ -3918,7 +3918,7 @@ create table t1 as select concat(microsecond('12:00:00.123456')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(month(20090224)));
@@ -3928,14 +3928,14 @@ create table t1 as select concat(month(20090224)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(last_day('2003-02-05')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select c1, hex(c1) from t1;
 c1	hex(c1)
@@ -3945,7 +3945,7 @@ create table t1 as select concat(from_days(730669)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select c1, hex(c1) from t1;
 c1	hex(c1)
@@ -3955,21 +3955,21 @@ create table t1 as select concat(curdate()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(utc_date()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(curtime()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select repeat('a',20) as c1 limit 0;
@@ -3985,7 +3985,7 @@ create table t1 as select concat(utc_time()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(sec_to_time(2378)));
@@ -3995,7 +3995,7 @@ create table t1 as select concat(sec_to_time(2378)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
@@ -4005,7 +4005,7 @@ create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(maketime(10,11,12)));
@@ -4015,7 +4015,7 @@ create table t1 as select concat(maketime(10,11,12)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(get_format(DATE,'USA'));
@@ -4025,7 +4025,7 @@ create table t1 as select get_format(DATE,'USA') as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(17) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(17) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(concat(from_unixtime(1111885200)),4));
@@ -4035,7 +4035,7 @@ create table t1 as select concat(from_unixtime(1111885200)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
@@ -4045,7 +4045,7 @@ create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:0
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
@@ -4055,7 +4055,7 @@ create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 c1
@@ -4068,7 +4068,7 @@ create table t1 as select concat(makedate(2009,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 c1
@@ -4078,21 +4078,21 @@ create table t1 as select concat(now()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(utc_timestamp()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select concat(sysdate()) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(addtime('00:00:00','11:22:33')));
@@ -4102,7 +4102,7 @@ create table t1 as select concat(addtime('00:00:00','11:22:33')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(26) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(26) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(subtime('23:59:59','11:22:33')));
@@ -4112,7 +4112,7 @@ create table t1 as select concat(subtime('23:59:59','11:22:33')) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(26) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(26) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(elt(1,2,3));
@@ -4122,7 +4122,7 @@ create table t1 as select elt(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(export_set(1,2,3,4,2));
@@ -4132,7 +4132,7 @@ create table t1 as select export_set(1,2,3,4,2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(127) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(127) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(insert(1133,3,0,22));
@@ -4142,7 +4142,7 @@ create table t1 as select insert(1133,3,0,22) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(lcase(123));
@@ -4152,7 +4152,7 @@ create table t1 as select lcase(123) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(left(123,1));
@@ -4162,7 +4162,7 @@ create table t1 as select left(123,1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(lower(123));
@@ -4172,7 +4172,7 @@ create table t1 as select lower(123) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(lpad(1,2,0));
@@ -4182,7 +4182,7 @@ create table t1 as select lpad(1,2,0) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(ltrim(1));
@@ -4192,7 +4192,7 @@ create table t1 as select ltrim(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(mid(1,1,1));
@@ -4202,7 +4202,7 @@ create table t1 as select mid(1,1,1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(repeat(1,2));
@@ -4212,7 +4212,7 @@ create table t1 as select repeat(1,2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(replace(1,1,2));
@@ -4222,7 +4222,7 @@ create table t1 as select replace(1,1,2) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(reverse(12));
@@ -4232,7 +4232,7 @@ create table t1 as select reverse(12) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(right(123,1));
@@ -4242,7 +4242,7 @@ create table t1 as select right(123,1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(rpad(1,2,0));
@@ -4252,7 +4252,7 @@ create table t1 as select rpad(1,2,0) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(rtrim(1));
@@ -4262,7 +4262,7 @@ create table t1 as select rtrim(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(soundex(1));
@@ -4272,7 +4272,7 @@ create table t1 as select soundex(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(substring(1,1,1));
@@ -4282,7 +4282,7 @@ create table t1 as select substring(1,1,1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(trim(1));
@@ -4292,7 +4292,7 @@ create table t1 as select trim(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(ucase(1));
@@ -4302,7 +4302,7 @@ create table t1 as select ucase(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(upper(1));
@@ -4312,14 +4312,14 @@ create table t1 as select upper(1) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select repeat(' ', 64) as a limit 0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(64) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ("1.1"), ("2.1");
 select a, hex(a) from t1;
@@ -4341,7 +4341,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a tinyint zerofill);
@@ -4369,7 +4369,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(12) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(12) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a smallint);
@@ -4381,7 +4381,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a smallint zerofill);
@@ -4403,7 +4403,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(9) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a mediumint zerofill);
@@ -4425,7 +4425,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(11) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(11) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a int zerofill);
@@ -4447,7 +4447,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(20) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a bigint zerofill);
@@ -4472,7 +4472,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(12) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(12) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a float zerofill);
@@ -4497,7 +4497,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(22) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(22) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a double zerofill);
@@ -4521,7 +4521,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a year);
@@ -4533,7 +4533,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a bit(64));
@@ -4569,7 +4569,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a date);
@@ -4583,7 +4583,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a time);
@@ -4601,7 +4601,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a datetime);
@@ -4615,7 +4615,7 @@ create table t2 as select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `concat(a)` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (a tinyint);
@@ -5049,37 +5049,37 @@ drop function f1;
 SET @x=md5('a');
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=old_password('a');
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=password('a');
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=sha('a');
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=sha1('a');
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=astext(point(1,2));
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 SET @x=aswkt(point(1,2));
 SELECT charset(@x), collation(@x);
 charset(@x)	collation(@x)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 #
 # Bug#54916 GROUP_CONCAT + IFNULL truncates output
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE TABLE t1 (a MEDIUMINT NULL) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1234567);
 SELECT GROUP_CONCAT(IFNULL(a,'')) FROM t1;
@@ -5108,116 +5108,116 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `CONCAT(a)` varchar(9) CHARACTER SET utf8 DEFAULT NULL,
-  `IFNULL(a,'')` varchar(9) CHARACTER SET utf8 NOT NULL,
-  `IF(a,a,'')` varchar(9) CHARACTER SET utf8 DEFAULT NULL,
-  `CASE WHEN a THEN a ELSE '' END` varchar(9) CHARACTER SET utf8 DEFAULT NULL,
-  `COALESCE(a,'')` varchar(9) CHARACTER SET utf8 DEFAULT NULL
+  `CONCAT(a)` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `IFNULL(a,'')` varchar(9) CHARACTER SET utf8mb3 NOT NULL,
+  `IF(a,a,'')` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `CASE WHEN a THEN a ELSE '' END` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `COALESCE(a,'')` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT CONCAT_WS(1,2,3) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `CONCAT_WS(1,2,3)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `CONCAT_WS(1,2,3)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT INSERT(1133,3,0,22) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `INSERT(1133,3,0,22)` varchar(6) CHARACTER SET utf8 DEFAULT NULL
+  `INSERT(1133,3,0,22)` varchar(6) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT LCASE(a) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `LCASE(a)` varchar(9) CHARACTER SET utf8 DEFAULT NULL
+  `LCASE(a)` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT UCASE(a) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `UCASE(a)` varchar(9) CHARACTER SET utf8 DEFAULT NULL
+  `UCASE(a)` varchar(9) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT REPEAT(1,2) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `REPEAT(1,2)` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `REPEAT(1,2)` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT LEFT(123,2) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `LEFT(123,2)` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `LEFT(123,2)` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT RIGHT(123,2) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `RIGHT(123,2)` varchar(2) CHARACTER SET utf8 DEFAULT NULL
+  `RIGHT(123,2)` varchar(2) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT LTRIM(123) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `LTRIM(123)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `LTRIM(123)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT RTRIM(123) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `RTRIM(123)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `RTRIM(123)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT ELT(1,111,222,333) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ELT(1,111,222,333)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `ELT(1,111,222,333)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT REPLACE(111,2,3) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `REPLACE(111,2,3)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `REPLACE(111,2,3)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT SUBSTRING_INDEX(111,111,1) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `SUBSTRING_INDEX(111,111,1)` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `SUBSTRING_INDEX(111,111,1)` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT MAKE_SET(111,222,3) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `MAKE_SET(111,222,3)` varchar(5) CHARACTER SET utf8 DEFAULT NULL
+  `MAKE_SET(111,222,3)` varchar(5) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT SOUNDEX(1) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `SOUNDEX(1)` varchar(4) CHARACTER SET utf8 DEFAULT NULL
+  `SOUNDEX(1)` varchar(4) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT EXPORT_SET(1,'Y','N','',8);
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `EXPORT_SET(1,'Y','N','',8)` varchar(64) CHARACTER SET utf8 DEFAULT NULL
+  `EXPORT_SET(1,'Y','N','',8)` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 DROP TABLE t1;
@@ -5229,7 +5229,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE TABLE t1 (
 id INT(11) DEFAULT NULL,
 date_column DATE DEFAULT NULL,
@@ -5248,14 +5248,14 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection, @@character_set_results;
 @@collation_connection	@@character_set_results
-utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3
 SELECT
 CHARSET(DATE_SUB('2007-08-03', INTERVAL 1 MINUTE)) AS field_str1,
 CHARSET(DATE_SUB('2007-08-03 17:33:00', INTERVAL 1 MINUTE)) AS field_str2,
 CHARSET(DATE_SUB(DATE('2007-08-03'), INTERVAL 1 DAY)) AS field_date,
 CHARSET(DATE_SUB(CAST('2007-08-03 17:33:00' AS DATETIME), INTERVAL 1 MINUTE)) AS field_datetime;
 field_str1	field_str2	field_date	field_datetime
-utf8	utf8	binary	binary
+utf8mb3	utf8mb3	binary	binary
 CREATE TABLE t1 AS
 SELECT
 DATE_SUB('2007-08-03', INTERVAL 1 MINUTE) AS field_str1,
@@ -5265,8 +5265,8 @@ DATE_SUB(CAST('2007-08-03 17:33:00' AS DATETIME), INTERVAL 1 MINUTE) AS field_da
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `field_str1` varchar(19) CHARACTER SET utf8 DEFAULT NULL,
-  `field1_str2` varchar(19) CHARACTER SET utf8 DEFAULT NULL,
+  `field_str1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `field1_str2` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL,
   `field_date` date DEFAULT NULL,
   `field_datetime` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -5295,14 +5295,14 @@ field_str1	field1_str2	field_date	field_datetime
 #
 SELECT @@collation_connection, @@character_set_results;
 @@collation_connection	@@character_set_results
-utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3
 SELECT
 CHARSET(ADDTIME(_latin1'10:01:01',_latin1'10:00:00')) AS addtime1,
 CHARSET(ADDTIME('10:01:01','10:00:00')) AS addtime2,
 CHARSET(DATE_ADD(_latin1'2001-01-01 10:01:01',interval 10 second)) AS date_add1,
 CHARSET(DATE_ADD('2001-01-01 10:01:01',interval 10 second)) AS date_add2;
 addtime1	addtime2	date_add1	date_add2
-utf8	utf8	utf8	utf8
+utf8mb3	utf8mb3	utf8mb3	utf8mb3
 CREATE TABLE t1 AS
 SELECT
 ADDTIME(_latin1'10:01:01',_latin1'10:00:00') AS addtime1,
@@ -5312,10 +5312,10 @@ DATE_ADD('2001-01-01 10:01:01',interval 10 second) AS date_add2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `addtime1` varchar(26) CHARACTER SET utf8 DEFAULT NULL,
-  `addtime2` varchar(26) CHARACTER SET utf8 DEFAULT NULL,
-  `date_add1` varchar(19) CHARACTER SET utf8 DEFAULT NULL,
-  `date_add2` varchar(19) CHARACTER SET utf8 DEFAULT NULL
+  `addtime1` varchar(26) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `addtime2` varchar(26) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `date_add1` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `date_add2` varchar(19) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM t1;
 addtime1	addtime2	date_add1	date_add2
@@ -5326,7 +5326,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE PROCEDURE p1()
 BEGIN
 DECLARE v_LastPaymentDate DATETIME DEFAULT NULL;
@@ -5345,7 +5345,7 @@ Note	1003	select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select concat(convert(v_LastPaymentDate@0 using utf8),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())`
+Note	1003	select concat(convert(v_LastPaymentDate@0 using utf8mb3),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())`
 DROP PROCEDURE p1;
 #
 # Bug#52159 returning time type from function and empty left join causes debug assertion
@@ -5363,7 +5363,7 @@ DROP TABLE t1;
 #
 SELECT @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 SELECT CASE 1 WHEN 2 THEN ( - '3' ) END;
 CASE 1 WHEN 2 THEN ( - '3' ) END
 NULL
@@ -5416,14 +5416,14 @@ EXPLAIN EXTENDED SELECT 'abcdÁÂÃÄÅ', _latin1'abcdÁÂÃÄÅ', _utf8'abcdÁ�
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select 'abcd�\0081ÂÃÄÅ' AS `abcd�\0081ÂÃÄÅ`,_latin1'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcd�\0081ÂÃÄÅ`,_utf8'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `u`
+Note	1003	select 'abcd�\0081ÂÃÄÅ' AS `abcd�\0081ÂÃÄÅ`,_latin1'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcd�\0081ÂÃÄÅ`,_utf8mb3'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `u`
 # Test normal utf8
 SET NAMES utf8;
 EXPLAIN EXTENDED SELECT 'abcdÁÂÃÄÅ', _latin1'abcdÁÂÃÄÅ', _utf8'abcdÁÂÃÄÅ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select 'abcdÁÂÃÄÅ' AS `abcdÁÂÃÄÅ`,_latin1'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcdÃ\0081ÂÃÄÅ`,_utf8'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcdÁÂÃÄÅ`
+Note	1003	select 'abcdÁÂÃÄÅ' AS `abcdÁÂÃÄÅ`,_latin1'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcdÃ\0081ÂÃÄÅ`,_utf8mb3'abcd\xC3\x81\xC3\x82\xC3\x83\xC3\x84\xC3\x85' AS `abcdÁÂÃÄÅ`
 #
 # Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT
 #
@@ -5464,7 +5464,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
@@ -5683,7 +5683,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
@@ -5902,7 +5902,7 @@ ADD KEY(ch);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ch` varchar(60) CHARACTER SET utf8 DEFAULT NULL,
+  `ch` varchar(60) CHARACTER SET utf8mb3 DEFAULT NULL,
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
@@ -6142,11 +6142,11 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c0` varchar(19) CHARACTER SET utf8 NOT NULL,
-  `c1` varchar(19) CHARACTER SET utf8 NOT NULL,
-  `c2` varchar(19) CHARACTER SET utf8 NOT NULL,
-  `c3` varchar(19) CHARACTER SET utf8 NOT NULL,
-  `c4` varchar(19) CHARACTER SET utf8 NOT NULL
+  `c0` varchar(19) CHARACTER SET utf8mb3 NOT NULL,
+  `c1` varchar(19) CHARACTER SET utf8mb3 NOT NULL,
+  `c2` varchar(19) CHARACTER SET utf8mb3 NOT NULL,
+  `c3` varchar(19) CHARACTER SET utf8mb3 NOT NULL,
+  `c4` varchar(19) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM t2;
 c0	c1	c2	c3	c4
@@ -6219,20 +6219,20 @@ HEX(i)	HEX(CHAR(i USING utf8))
 131F197	NULL
 1326A35	01326A35
 Warnings:
-Warning	1300	Invalid utf8 character string: 'F197'
+Warning	1300	Invalid utf8mb3 character string: 'F197'
 SET sql_mode='STRICT_ALL_TABLES';
 SELECT HEX(i), HEX(CHAR(i USING utf8)) FROM t1;
 HEX(i)	HEX(CHAR(i USING utf8))
 131F197	NULL
 1326A35	01326A35
 Warnings:
-Warning	1300	Invalid utf8 character string: 'F197'
+Warning	1300	Invalid utf8mb3 character string: 'F197'
 SELECT CHAR(i USING utf8) FROM t1;
 CHAR(i USING utf8)
 ###
 ###
 Warnings:
-###	1300	Invalid utf8 character string: 'F197'
+###	1300	Invalid utf8mb3 character string: 'F197'
 SET sql_mode=DEFAULT;
 DROP TABLE t1;
 #
@@ -6271,12 +6271,12 @@ SET sql_mode=default;
 set names utf8;
 select @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 CREATE TABLE t1 AS SELECT 'a' AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 NOT NULL
+  `a` varchar(1) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -6296,7 +6296,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(5) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(5) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -6412,7 +6412,7 @@ hex(weight_string('abc',25, 4, 0xC0))
 00410042004300200020002000200020002000200020002000
 select @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 select hex(weight_string(cast(_latin1 0x80 as char)));
 hex(weight_string(cast(_latin1 0x80 as char)))
 20AC
@@ -6484,7 +6484,7 @@ hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0))
 20AC20AC20AC00200020002000200020002000200020002000
 select @@collation_connection;
 @@collation_connection
-utf8_general_ci
+utf8mb3_general_ci
 select hex(weight_string('a' LEVEL 1));
 hex(weight_string('a' LEVEL 1))
 0041
@@ -6515,12 +6515,12 @@ DFFFDFFFBCFFBDFFBEFF
 set @@collation_connection=utf8_bin;
 select @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 CREATE TABLE t1 AS SELECT 'a' AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
+  `a` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -6540,7 +6540,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',5) AS a;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(5) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `a` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 CREATE TABLE t2 AS SELECT WEIGHT_STRING(a) AS ws FROM t1;
 SHOW CREATE TABLE t2;
@@ -6656,7 +6656,7 @@ hex(weight_string('abc',25, 4, 0xC0))
 00610062006300200020002000200020002000200020002000
 select @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 select hex(weight_string(cast(_latin1 0x80 as char)));
 hex(weight_string(cast(_latin1 0x80 as char)))
 20AC
@@ -6728,7 +6728,7 @@ hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0))
 20AC20AC20AC00200020002000200020002000200020002000
 select @@collation_connection;
 @@collation_connection
-utf8_bin
+utf8mb3_bin
 select hex(weight_string('a' LEVEL 1));
 hex(weight_string('a' LEVEL 1))
 0061
@@ -6794,7 +6794,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE CONCAT(c1)='a';
@@ -6817,7 +6817,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE 'a'=CONCAT(c1);
@@ -6840,7 +6840,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '% '=CONCAT(c1);
@@ -6863,7 +6863,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '%'=CONCAT(c1);
@@ -6889,7 +6889,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ';
@@ -6915,7 +6915,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE CONCAT(c1)='a';
@@ -6938,7 +6938,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT * FROM t1 WHERE 'a'=CONCAT(c1);
@@ -6961,7 +6961,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '% '=CONCAT(c1);
@@ -6984,7 +6984,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('%'),('% ');
 SELECT * FROM t1 WHERE '%'=CONCAT(c1);
@@ -7010,7 +7010,7 @@ CREATE TABLE t1 AS SELECT SPACE(10) AS a LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('a'),('a ');
 SELECT a, LENGTH(a) FROM t1 WHERE a NOT LIKE 'a ';
@@ -7035,7 +7035,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a',10) AS c1 LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('ae'),('ä');
 SELECT * FROM t1 WHERE c1='ä';
@@ -7071,17 +7071,17 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
 INSERT INTO t1 VALUES ('a');
 SELECT CONCAT(a,0xFF) FROM t1;
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 SELECT CONCAT(a,0xC3BF) FROM t1;
 CONCAT(a,0xC3BF)
 aÿ
 DROP TABLE t1;
 SELECT CONCAT('a' COLLATE utf8_unicode_ci, _binary 0xFF);
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 PREPARE stmt FROM "SELECT CONCAT('a' COLLATE utf8_unicode_ci, ?)";
 SET @arg00=_binary 0xFF;
 EXECUTE stmt USING @arg00;
-ERROR HY000: Invalid utf8 character string: 'FF'
+ERROR HY000: Invalid utf8mb3 character string: 'FF'
 DEALLOCATE PREPARE stmt;
 SET NAMES latin1;
 PREPARE stmt FROM "SELECT CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)";
@@ -7156,7 +7156,7 @@ CONCAT(b,IF(a,?,?))
 a
 SET @b='я';
 EXECUTE stmt USING @b,@b;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 #
@@ -7171,7 +7171,7 @@ SET @query=_binary'SELECT CHARSET(\'test\'),@@character_set_client,@@character_s
 PREPARE stmt FROM @query;
 EXECUTE stmt;
 CHARSET('test')	@@character_set_client	@@character_set_connection
-utf8	utf8	utf8
+utf8mb3	utf8mb3	utf8mb3
 DEALLOCATE PREPARE stmt;
 CREATE TABLE allbytes (a VARBINARY(10));
 # Using selected bytes combinations
@@ -7238,7 +7238,7 @@ CALL p1(val);
 END LOOP;  
 CLOSE stmt;
 END//
-CREATE FUNCTION iswellformed(a VARBINARY(256)) RETURNS INT RETURN a=BINARY CONVERT(a USING utf8);//
+CREATE FUNCTION iswellformed(a VARBINARY(256)) RETURNS INT RETURN a=BINARY CONVERT(a USING utf8mb3);//
 CREATE FUNCTION unescape(a VARBINARY(256)) RETURNS VARBINARY(256)
 BEGIN
 # We need to do it in a way to avoid producing new escape sequences
@@ -10241,7 +10241,7 @@ CHAR(0xDF USING latin1)
 CREATE OR REPLACE VIEW v1 AS SELECT CHAR(0xDF USING latin1) AS c;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select char(0xdf using latin1) AS `c`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select char(0xdf using latin1) AS `c`	utf8mb3	utf8mb3_general_ci
 SELECT * FROM v1;
 c
 ß
@@ -10256,7 +10256,7 @@ CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS t LIMIT 0;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `t` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `t` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('abcdefghi'),('ABCDEFGHI');
 SELECT CONCAT(t2,'-',t2) c2 FROM (SELECT LOWER(t) t2 FROM t1) sub;
@@ -10280,7 +10280,7 @@ SET optimizer_switch=@save_optimizer_switch;
 #
 SET NAMES utf8;
 SELECT * FROM `test😁😁test`;
-ERROR HY000: Invalid utf8 character string: 'test\xF0\x9F\x98\x81\xF0\x9F\x98\x81test'
+ERROR HY000: Invalid utf8mb3 character string: 'test\xF0\x9F\x98\x81\xF0\x9F\x98\x81test'
 #
 #MDEV-8256 A part of a ROW comparison is erroneously optimized away
 #
@@ -10508,23 +10508,23 @@ SELECT CONVERT(_utf8 0xC499 USING latin1);
 CONVERT(_utf8 0xC499 USING latin1)
 ?
 Warnings:
-Warning	1977	Cannot convert 'utf8' character 0xC499 to 'latin1'
+Warning	1977	Cannot convert 'utf8mb3' character 0xC499 to 'latin1'
 SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
 CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1)
 ?
 Warnings:
-Warning	1977	Cannot convert 'utf8' character 0xC499 to 'latin1'
+Warning	1977	Cannot convert 'utf8mb3' character 0xC499 to 'latin1'
 SET sql_mode=default;
 SELECT CONVERT(_utf8 0xC499 USING latin1);
 CONVERT(_utf8 0xC499 USING latin1)
 ?
 Warnings:
-Warning	1977	Cannot convert 'utf8' character 0xC499 to 'latin1'
+Warning	1977	Cannot convert 'utf8mb3' character 0xC499 to 'latin1'
 SELECT CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1);
 CAST(_utf8 0xC499 AS CHAR CHARACTER SET latin1)
 ?
 Warnings:
-Warning	1977	Cannot convert 'utf8' character 0xC499 to 'latin1'
+Warning	1977	Cannot convert 'utf8mb3' character 0xC499 to 'latin1'
 #
 # MDEV-15005 ASAN: stack-buffer-overflow in my_strnncollsp_simple
 #
@@ -10655,7 +10655,7 @@ SET NAMES utf8;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(30) CHARACTER SET utf8 DEFAULT concat('ß')
+  `a` varchar(30) CHARACTER SET utf8mb3 DEFAULT concat('ß')
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (DEFAULT);
 SELECT HEX(a), a FROM t1;
@@ -10679,7 +10679,7 @@ CREATE TABLE t1 (a VARCHAR(30) CHARACTER SET utf8 DEFAULT CONCAT('ß'));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(30) CHARACTER SET utf8 DEFAULT concat('ß')
+  `a` varchar(30) CHARACTER SET utf8mb3 DEFAULT concat('ß')
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (DEFAULT);
 SELECT HEX(a) FROM t1;
@@ -10700,9 +10700,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_general_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_general_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_general_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_nopad_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -10838,9 +10838,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_general_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_general_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_general_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_nopad_ci
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -10977,9 +10977,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_nopad_bin';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_nopad_bin NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_nopad_bin NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_nopad_bin
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_nopad_bin
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -11115,9 +11115,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_nopad_bin';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_nopad_bin NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_nopad_bin NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_nopad_bin
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_nopad_bin
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
index 01e5a0e8c80..255b06095bd 100644
--- a/mysql-test/main/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
@@ -2,7 +2,7 @@
 # Tests with the utf8 character set
 #
 
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 SET TIME_ZONE='+03:00';
 
diff --git a/mysql-test/main/ctype_utf8_def_upgrade.result b/mysql-test/main/ctype_utf8_def_upgrade.result
index 4f8a2b27db2..29bcbe299ec 100644
--- a/mysql-test/main/ctype_utf8_def_upgrade.result
+++ b/mysql-test/main/ctype_utf8_def_upgrade.result
@@ -52,11 +52,11 @@ SET @@character_set_database=DEFAULT;
 # Emulate a pre-4.1 database without db.opt
 SHOW CREATE DATABASE db1;
 Database	Create Database
-db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8 */
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 USE db1;
 SELECT @@character_set_database, 'taken from defaults' AS comment;
 @@character_set_database	comment
-utf8	taken from defaults
+utf8mb3	taken from defaults
 USE test;
 ALTER DATABASE db1 DEFAULT CHARACTER SET latin1;
 USE db1;
diff --git a/mysql-test/main/ctype_utf8_uca.result b/mysql-test/main/ctype_utf8_uca.result
index ef64203bbbe..930f71f36d7 100644
--- a/mysql-test/main/ctype_utf8_uca.result
+++ b/mysql-test/main/ctype_utf8_uca.result
@@ -16,9 +16,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_unicode_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_unicode_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_unicode_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_nopad_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -154,9 +154,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_unicode_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_unicode_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_unicode_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_nopad_ci
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -293,9 +293,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_unicode_520_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_unicode_520_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_unicode_520_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_520_nopad_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_520_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -431,9 +431,9 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) COLLATE 'utf8_unicode_520_nopad_ci';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) COLLATE utf8_unicode_520_nopad_ci NOT NULL,
+  `a` varchar(10) COLLATE utf8mb3_unicode_520_nopad_ci NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_520_nopad_ci
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_520_nopad_ci
 INSERT INTO t1 VALUES ('abc'),('abc  '),(' a'),(' a '),('a   ');
 SELECT HEX(a), a FROM t1 ORDER BY a;
 HEX(a)	a
@@ -568,8 +568,8 @@ ALTER TABLE t1 ADD KEY(a), ADD KEY(b);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_nopad_ci DEFAULT NULL,
-  `b` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_nopad_ci DEFAULT NULL,
+  `a` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_nopad_ci DEFAULT NULL,
+  `b` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_nopad_ci DEFAULT NULL,
   KEY `a` (`a`),
   KEY `b` (`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result
index 20ebfd255b2..741247684d7 100644
--- a/mysql-test/main/ctype_utf8mb4.result
+++ b/mysql-test/main/ctype_utf8mb4.result
@@ -1849,7 +1849,7 @@ character_set_database	latin1
 character_set_filesystem	binary
 character_set_results	utf8mb4
 character_set_server	latin1
-character_set_system	utf8
+character_set_system	utf8mb3
 SET @@character_set_server=@save_character_set_server;
 CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 USE crashtest;
@@ -2066,7 +2066,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1;
 concat(a, if(b>10, N'x', N'y'))
 ay
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8mb4;
 create table t1 (a varchar(10) character set latin1, b int);
@@ -2553,7 +2553,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1;
 u_decimal	hex(utf8mb4_encoding)	utf8mb4_encoding
 119040	3F	?
@@ -2586,7 +2586,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 42856	EA9DA8
@@ -2598,7 +2598,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 119040	3F
@@ -2619,7 +2619,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 119040	3F
@@ -2640,7 +2640,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 42856	EA9DA8
@@ -2686,7 +2686,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `utf8mb4` varchar(10) CHARACTER SET utf8mb4 NOT NULL,
-  `utf8mb3` varchar(10) CHARACTER SET utf8 NOT NULL,
+  `utf8mb3` varchar(10) CHARACTER SET utf8mb3 NOT NULL,
   `concat(utf8mb4,utf8mb3)` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TEMPORARY TABLE t3;
@@ -2706,9 +2706,9 @@ DROP TABLE t2;
 CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4);
 INSERT INTO t1 VALUES (x'f48fbfbf');
 SELECT CONCAT(utf8mb4, _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 SELECT CONCAT('a', _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 DROP TABLE t1;
 #
 # Bug#51675 Server crashes on inserting 4 byte char.
@@ -2733,7 +2733,7 @@ t1	CREATE TABLE `t1` (
   `subject` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `p` varchar(255) DEFAULT NULL,
   KEY `subject` (`subject`(250))
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 INSERT INTO t1(subject) VALUES ('abcd');
 INSERT INTO t1(subject) VALUES(x'f0909080');
 DROP TABLE t1;
diff --git a/mysql-test/main/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result
index 9eb7d48370f..a1531acb07d 100644
--- a/mysql-test/main/ctype_utf8mb4_heap.result
+++ b/mysql-test/main/ctype_utf8mb4_heap.result
@@ -1681,7 +1681,7 @@ character_set_database	latin1
 character_set_filesystem	binary
 character_set_results	utf8mb4
 character_set_server	latin1
-character_set_system	utf8
+character_set_system	utf8mb3
 SET @@character_set_server=@save_character_set_server;
 CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 USE crashtest;
@@ -1898,7 +1898,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1;
 concat(a, if(b>10, N'x', N'y'))
 ay
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8mb4;
 create table t1 (a varchar(10) character set latin1, b int) engine heap;
@@ -2354,7 +2354,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1;
 u_decimal	hex(utf8mb4_encoding)	utf8mb4_encoding
 1114111	3F	?
@@ -2387,7 +2387,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2399,7 +2399,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2420,7 +2420,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2441,7 +2441,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2487,7 +2487,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `utf8mb4` varchar(10) CHARACTER SET utf8mb4 NOT NULL,
-  `utf8mb3` varchar(10) CHARACTER SET utf8 NOT NULL,
+  `utf8mb3` varchar(10) CHARACTER SET utf8mb3 NOT NULL,
   `concat(utf8mb4,utf8mb3)` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TEMPORARY TABLE t3;
@@ -2507,9 +2507,9 @@ DROP TABLE t2;
 CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE heap;
 INSERT INTO t1 VALUES (x'f48fbfbf');
 SELECT CONCAT(utf8mb4, _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 SELECT CONCAT('a', _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result
index fc2a368f3f0..d291882db04 100644
--- a/mysql-test/main/ctype_utf8mb4_innodb.result
+++ b/mysql-test/main/ctype_utf8mb4_innodb.result
@@ -1807,7 +1807,7 @@ character_set_database	latin1
 character_set_filesystem	binary
 character_set_results	utf8mb4
 character_set_server	latin1
-character_set_system	utf8
+character_set_system	utf8mb3
 SET @@character_set_server=@save_character_set_server;
 CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 USE crashtest;
@@ -2024,7 +2024,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1;
 concat(a, if(b>10, N'x', N'y'))
 ay
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8mb4;
 create table t1 (a varchar(10) character set latin1, b int) engine InnoDB;
@@ -2497,7 +2497,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1;
 u_decimal	hex(utf8mb4_encoding)	utf8mb4_encoding
 1114111	3F	?
@@ -2530,7 +2530,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2542,7 +2542,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2563,7 +2563,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2584,7 +2584,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2630,7 +2630,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `utf8mb4` varchar(10) CHARACTER SET utf8mb4 NOT NULL,
-  `utf8mb3` varchar(10) CHARACTER SET utf8 NOT NULL,
+  `utf8mb3` varchar(10) CHARACTER SET utf8mb3 NOT NULL,
   `concat(utf8mb4,utf8mb3)` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TEMPORARY TABLE t3;
@@ -2650,9 +2650,9 @@ DROP TABLE t2;
 CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE InnoDB;
 INSERT INTO t1 VALUES (x'f48fbfbf');
 SELECT CONCAT(utf8mb4, _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 SELECT CONCAT('a', _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result
index ee2bd4431fc..6017c5a0a24 100644
--- a/mysql-test/main/ctype_utf8mb4_myisam.result
+++ b/mysql-test/main/ctype_utf8mb4_myisam.result
@@ -1814,7 +1814,7 @@ character_set_database	latin1
 character_set_filesystem	binary
 character_set_results	utf8mb4
 character_set_server	latin1
-character_set_system	utf8
+character_set_system	utf8mb3
 SET @@character_set_server=@save_character_set_server;
 CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 USE crashtest;
@@ -2031,7 +2031,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1;
 concat(a, if(b>10, N'x', N'y'))
 ay
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
-ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 drop table t1;
 set names utf8mb4;
 create table t1 (a varchar(10) character set latin1, b int) engine MyISAM;
@@ -2506,7 +2506,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1;
 u_decimal	hex(utf8mb4_encoding)	utf8mb4_encoding
 1114111	3F	?
@@ -2539,7 +2539,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2551,7 +2551,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2572,7 +2572,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb4_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb4_encoding) FROM t1;
 u_decimal	hex(utf8mb4_encoding)
 1114111	3F
@@ -2593,7 +2593,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `u_decimal` int(11) NOT NULL,
   `utf8mb3_encoding` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 SELECT u_decimal,hex(utf8mb3_encoding) FROM t2;
 u_decimal	hex(utf8mb3_encoding)
 1114111	3F3F3F3F
@@ -2639,7 +2639,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `utf8mb4` varchar(10) CHARACTER SET utf8mb4 NOT NULL,
-  `utf8mb3` varchar(10) CHARACTER SET utf8 NOT NULL,
+  `utf8mb3` varchar(10) CHARACTER SET utf8mb3 NOT NULL,
   `concat(utf8mb4,utf8mb3)` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TEMPORARY TABLE t3;
@@ -2659,9 +2659,9 @@ DROP TABLE t2;
 CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE MyISAM;
 INSERT INTO t1 VALUES (x'f48fbfbf');
 SELECT CONCAT(utf8mb4, _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 SELECT CONCAT('a', _utf8 '�') FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8_general_ci,COERCIBLE) for operation 'concat'
+ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat'
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff --git a/mysql-test/main/custom_aggregate_functions.result b/mysql-test/main/custom_aggregate_functions.result
index 884bd8b555f..eb1e94f0d13 100644
--- a/mysql-test/main/custom_aggregate_functions.result
+++ b/mysql-test/main/custom_aggregate_functions.result
@@ -1060,9 +1060,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` text CHARACTER SET utf8 DEFAULT NULL,
-  `c3` varchar(255) CHARACTER SET utf8 DEFAULT NULL
+  `c1` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -1079,9 +1079,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET utf8 DEFAULT NULL,
-  `c2` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -1098,9 +1098,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -1117,9 +1117,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result
index 612a4a4cbff..d2cc13bf58f 100644
--- a/mysql-test/main/ddl_i18n_koi8r.result
+++ b/mysql-test/main/ddl_i18n_koi8r.result
@@ -27,11 +27,11 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1`	koi8r	koi8r_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8mb3'тест' AS `c1`	koi8r	koi8r_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `����`	koi8r	koi8r_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8mb3'тест' AS `����`	koi8r	koi8r_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
@@ -53,7 +53,7 @@ koi8r_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
-utf8_general_ci
+utf8mb3_general_ci
 
 SELECT * FROM v3|
 ����
@@ -78,11 +78,11 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1`	koi8r	koi8r_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8mb3'тест' AS `c1`	koi8r	koi8r_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `����`	koi8r	koi8r_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8mb3'тест' AS `����`	koi8r	koi8r_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
@@ -104,7 +104,7 @@ koi8r_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
-utf8_general_ci
+utf8mb3_general_ci
 
 SELECT * FROM v3|
 ����
@@ -134,11 +134,11 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1`	koi8r	koi8r_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8mb3'тест' AS `c1`	koi8r	koi8r_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `����`	koi8r	koi8r_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8mb3'тест' AS `����`	koi8r	koi8r_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
@@ -160,7 +160,7 @@ koi8r_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
-utf8_general_ci
+utf8mb3_general_ci
 
 SELECT * FROM v3|
 ����
@@ -277,7 +277,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -298,7 +298,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -319,7 +319,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -340,24 +340,24 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -376,7 +376,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -394,7 +394,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -412,7 +412,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -430,7 +430,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -439,39 +439,39 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -482,24 +482,24 @@ SET @@character_set_results= cp1251|
 SET @@collation_connection= cp1251_general_ci|
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 set names koi8r|
 
 
@@ -522,7 +522,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -543,7 +543,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -564,7 +564,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -585,24 +585,24 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -621,7 +621,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -639,7 +639,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -657,7 +657,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -675,7 +675,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -684,46 +684,46 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 ---> Dump of mysqltest1
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -757,7 +757,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -799,7 +799,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -833,7 +833,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -883,24 +883,24 @@ SET @@character_set_results= cp1251|
 SET @@collation_connection= cp1251_general_ci|
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 set names koi8r|
 
 
@@ -923,7 +923,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -944,7 +944,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -965,7 +965,7 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -986,24 +986,24 @@ COLLATION(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -1022,7 +1022,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1040,7 +1040,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1058,7 +1058,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1076,7 +1076,7 @@ COLLATION( '�����') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -1085,39 +1085,39 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r
+koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 connection default;
 disconnect con2;
 disconnect con3;
@@ -1211,7 +1211,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1227,7 +1227,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1243,7 +1243,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1259,7 +1259,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1275,7 +1275,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1287,7 +1287,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -1304,7 +1304,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1316,7 +1316,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -1333,7 +1333,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1348,7 +1348,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1363,7 +1363,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1378,7 +1378,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1402,10 +1402,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1415,7 +1415,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -1433,10 +1433,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1446,7 +1446,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 
@@ -1483,7 +1483,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1499,7 +1499,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1515,7 +1515,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1531,7 +1531,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1547,7 +1547,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1559,7 +1559,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -1576,7 +1576,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1588,7 +1588,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -1605,7 +1605,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1620,7 +1620,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1635,7 +1635,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1650,7 +1650,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1674,10 +1674,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1687,7 +1687,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -1705,10 +1705,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1718,7 +1718,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 
@@ -1730,17 +1730,17 @@ USE `mysqltest1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
-  `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `msg` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -1769,7 +1769,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -1809,17 +1809,17 @@ USE `mysqltest2`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
-  `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `msg` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -1848,7 +1848,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -1917,7 +1917,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1933,7 +1933,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1949,7 +1949,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 = _koi8r    '�����';
 SET @a2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1965,7 +1965,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 = _koi8r    '�����';
 SET @b2 = _utf8 'текст';
-END	koi8r	koi8r_general_ci	utf8_unicode_ci	#
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1981,7 +1981,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1993,7 +1993,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -2010,7 +2010,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -2022,7 +2022,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -2039,7 +2039,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2054,7 +2054,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2069,7 +2069,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2084,7 +2084,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2108,10 +2108,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -2121,7 +2121,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -2139,10 +2139,10 @@ koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
 koi8r_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -2152,7 +2152,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-koi8r_general_ci	utf8_general_ci	koi8r_general_ci	koi8r_general_ci	utf8_general_ci	koi8r_general_ci
+koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 connection default;
@@ -2241,7 +2241,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2254,7 +2254,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2267,7 +2267,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2280,16 +2280,16 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2309,7 +2309,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2322,7 +2322,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2335,7 +2335,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2348,7 +2348,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -2375,7 +2375,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2388,7 +2388,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2401,7 +2401,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2414,16 +2414,16 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2443,7 +2443,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2456,7 +2456,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2469,7 +2469,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2482,7 +2482,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 ---> Dump of mysqltest1
 
@@ -2491,7 +2491,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER
 USE `mysqltest1`;
 /*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
 DELIMITER ;;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
@@ -2519,7 +2519,7 @@ END */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;;
 DELIMITER ;;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
@@ -2558,7 +2558,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER
 USE `mysqltest2`;
 /*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
 DELIMITER ;;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
@@ -2586,7 +2586,7 @@ END */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;;
 DELIMITER ;;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
@@ -2647,7 +2647,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2660,7 +2660,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2673,7 +2673,7 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2686,16 +2686,16 @@ COLLATION(_koi8r    '�����') AS c3,
 COLLATION(_utf8 'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2715,7 +2715,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2728,7 +2728,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2741,7 +2741,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2754,7 +2754,7 @@ COLLATION(    '�����') AS c3,
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
@@ -2781,27 +2781,27 @@ END|
 CALL p1()|
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 SHOW CREATE TABLE t1|
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 
 CALL mysqltest2.p2()|
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 SHOW CREATE TABLE mysqltest2.t2|
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 ALTER DATABASE mysqltest1 COLLATE cp1251_general_cs|
 ALTER DATABASE mysqltest2 COLLATE cp1251_general_cs|
diff --git a/mysql-test/main/ddl_i18n_koi8r.test b/mysql-test/main/ddl_i18n_koi8r.test
index ada21b092aa..70e7e2e81ca 100644
--- a/mysql-test/main/ddl_i18n_koi8r.test
+++ b/mysql-test/main/ddl_i18n_koi8r.test
@@ -38,7 +38,7 @@ set sql_mode="";
 --source include/have_cp866.inc
 --source include/have_cp1251.inc
 --source include/have_koi8r.inc
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 ###########################################################################
diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result
index 2be5413f182..d1cec7c0690 100644
--- a/mysql-test/main/ddl_i18n_utf8.result
+++ b/mysql-test/main/ddl_i18n_utf8.result
@@ -23,33 +23,33 @@ CREATE VIEW v3 AS SELECT _koi8r'����'|
 
 SHOW CREATE VIEW v1|
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8mb3	utf8mb3_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 
 SELECT COLLATION(c1), COLLATION(c2) FROM v1|
 COLLATION(c1)	COLLATION(c2)
-utf8_general_ci	binary
+utf8mb3_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
@@ -74,33 +74,33 @@ set names utf8|
 
 SHOW CREATE VIEW v1|
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8mb3	utf8mb3_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 
 SELECT COLLATION(c1), COLLATION(c2) FROM v1|
 COLLATION(c1)	COLLATION(c2)
-utf8_general_ci	binary
+utf8mb3_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
@@ -130,33 +130,33 @@ set names utf8|
 
 SHOW CREATE VIEW v1|
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v2|
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'����' AS `c1`	utf8mb3	utf8mb3_general_ci
 
 SHOW CREATE VIEW v3|
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'����' AS `тест`	utf8mb3	utf8mb3_general_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v1	select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1`	NONE	YES	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v2	select 'тест' AS `c1`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'|
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
-def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8	utf8_general_ci	UNDEFINED
+def	mysqltest1	v3	select 'тест' AS `тест`	NONE	NO	root@localhost	DEFINER	utf8mb3	utf8mb3_general_ci	UNDEFINED
 
 
 SELECT COLLATION(c1), COLLATION(c2) FROM v1|
 COLLATION(c1)	COLLATION(c2)
-utf8_general_ci	binary
+utf8mb3_general_ci	binary
 
 SELECT COLLATION(c1) FROM v2|
 COLLATION(c1)
@@ -277,7 +277,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -298,7 +298,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -319,7 +319,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -340,24 +340,24 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -376,7 +376,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -394,7 +394,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -412,7 +412,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -430,7 +430,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -439,39 +439,39 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -482,24 +482,24 @@ SET @@character_set_results= cp1251|
 SET @@collation_connection= cp1251_general_ci|
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 set names utf8|
 
 
@@ -522,7 +522,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -543,7 +543,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -564,7 +564,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -585,24 +585,24 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -621,7 +621,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -639,7 +639,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -657,7 +657,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -675,7 +675,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -684,52 +684,52 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 ---> Dump of mysqltest1
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest1`;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -757,13 +757,13 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -799,13 +799,13 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 */;
 
 USE `mysqltest2`;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -833,13 +833,13 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -883,24 +883,24 @@ SET @@character_set_results= cp1251|
 SET @@collation_connection= cp1251_general_ci|
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 set names utf8|
 
 
@@ -923,7 +923,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -944,7 +944,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -965,7 +965,7 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
@@ -986,24 +986,24 @@ COLLATION(_koi8r    '�����') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW PROCEDURE STATUS LIKE 'p1'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p1	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p2'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	p2	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p3'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p3	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW PROCEDURE STATUS LIKE 'p4'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest2	p4	PROCEDURE	root@localhost	MODIFIED	CREATED	DEFINER		utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p1'|
@@ -1022,7 +1022,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1040,7 +1040,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1058,7 +1058,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1076,7 +1076,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED			root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a = '1'|
@@ -1085,39 +1085,39 @@ SET @b = '2'|
 
 CALL p1(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL p2(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 
 CALL mysqltest2.p3(@a, @b)|
 c1	c2	c3
-utf8_unicode_ci	utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci	utf8mb3_unicode_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_unicode_ci	utf8_unicode_ci
+utf8mb3_unicode_ci	utf8mb3_unicode_ci
 
 CALL mysqltest2.p4(@a, @b)|
 c1	c2	c3
-utf8_general_ci	utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	utf8mb3_general_ci
 c4	c5	c6	c7	c8
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3
 SELECT COLLATION(@a) AS ca, COLLATION(@b) cb|
 ca	cb
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 connection default;
 disconnect con2;
 disconnect con3;
@@ -1211,7 +1211,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1227,7 +1227,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1243,7 +1243,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1259,7 +1259,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1275,7 +1275,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1287,7 +1287,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -1304,7 +1304,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1316,7 +1316,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -1333,7 +1333,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1348,7 +1348,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1363,7 +1363,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1378,7 +1378,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1396,16 +1396,16 @@ SELECT msg FROM log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1415,7 +1415,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -1427,16 +1427,16 @@ SELECT msg FROM mysqltest2.log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1446,7 +1446,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 
@@ -1483,7 +1483,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1499,7 +1499,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1515,7 +1515,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1531,7 +1531,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1547,7 +1547,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1559,7 +1559,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -1576,7 +1576,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1588,7 +1588,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -1605,7 +1605,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1620,7 +1620,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1635,7 +1635,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1650,7 +1650,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -1668,16 +1668,16 @@ SELECT msg FROM log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1687,7 +1687,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -1699,16 +1699,16 @@ SELECT msg FROM mysqltest2.log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -1718,7 +1718,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 
@@ -1730,23 +1730,23 @@ USE `mysqltest1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
-  `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `msg` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -1769,13 +1769,13 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -1809,23 +1809,23 @@ USE `mysqltest2`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log` (
-  `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `msg` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1),(0),(1);
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -1848,13 +1848,13 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -1917,7 +1917,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1933,7 +1933,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1949,7 +1949,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 = _utf8 'текст';
 SET @a3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
@@ -1965,7 +1965,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 = _utf8 'текст';
 SET @b3 = _koi8r    '�����';
-END	utf8	utf8_general_ci	utf8_unicode_ci	#
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci	#
 
 
 SHOW TRIGGERS|
@@ -1981,7 +1981,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1993,7 +1993,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 use mysqltest2|
 
@@ -2010,7 +2010,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -2022,7 +2022,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	#		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	#		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 use mysqltest1|
 
 
@@ -2039,7 +2039,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2054,7 +2054,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2069,7 +2069,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2084,7 +2084,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED		root@localhost	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2102,16 +2102,16 @@ SELECT msg FROM log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -2121,7 +2121,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM log|
 
@@ -2133,16 +2133,16 @@ SELECT msg FROM mysqltest2.log|
 msg
 koi8r_general_ci
 koi8r_general_ci
-utf8
-utf8
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_general_ci
-utf8_unicode_ci
+utf8mb3
+utf8mb3
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_general_ci
+utf8mb3_unicode_ci
 
 SELECT
 COLLATION(@a1) AS ca1,
@@ -2152,7 +2152,7 @@ COLLATION(@b1) AS cb1,
 COLLATION(@b2) AS cb2,
 COLLATION(@b3) AS cb3|
 ca1	ca2	ca3	cb1	cb2	cb3
-utf8_general_ci	utf8_general_ci	koi8r_general_ci	utf8_general_ci	utf8_general_ci	koi8r_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci
 
 DELETE FROM mysqltest2.log|
 connection default;
@@ -2241,7 +2241,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2254,7 +2254,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2267,7 +2267,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2280,16 +2280,16 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2309,7 +2309,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2322,7 +2322,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2335,7 +2335,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2348,7 +2348,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 ALTER DATABASE mysqltest1 COLLATE cp866_general_ci|
@@ -2375,7 +2375,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2388,7 +2388,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2401,7 +2401,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2414,16 +2414,16 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2443,7 +2443,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2456,7 +2456,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2469,7 +2469,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2482,7 +2482,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 ---> Dump of mysqltest1
 
@@ -2491,13 +2491,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER
 USE `mysqltest1`;
 /*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
 DELIMITER ;;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client  = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;;
+/*!50003 SET character_set_client  = utf8mb3 */ ;;
+/*!50003 SET character_set_results = utf8mb3 */ ;;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
 /*!50003 SET sql_mode              = '' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
@@ -2519,13 +2519,13 @@ END */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
 ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;;
 DELIMITER ;;
-ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client  = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;;
+/*!50003 SET character_set_client  = utf8mb3 */ ;;
+/*!50003 SET character_set_results = utf8mb3 */ ;;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
 /*!50003 SET sql_mode              = '' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
@@ -2558,13 +2558,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER
 USE `mysqltest2`;
 /*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
 DELIMITER ;;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client  = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;;
+/*!50003 SET character_set_client  = utf8mb3 */ ;;
+/*!50003 SET character_set_results = utf8mb3 */ ;;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
 /*!50003 SET sql_mode              = '' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
@@ -2586,13 +2586,13 @@ END */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
 ALTER DATABASE `mysqltest2` CHARACTER SET cp866 COLLATE cp866_general_ci ;;
 DELIMITER ;;
-ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
+ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client  = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;;
+/*!50003 SET character_set_client  = utf8mb3 */ ;;
+/*!50003 SET character_set_results = utf8mb3 */ ;;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
 /*!50003 SET sql_mode              = '' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
@@ -2647,7 +2647,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2660,7 +2660,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2673,7 +2673,7 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
@@ -2686,16 +2686,16 @@ COLLATION(_utf8 'текст') AS c3,
 COLLATION(_koi8r    '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	utf8	utf8_general_ci	utf8_unicode_ci
+END	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 
 SHOW EVENTS LIKE 'ev1'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev1	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev2'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8	utf8_general_ci	utf8_unicode_ci
+mysqltest1	ev2	root@localhost	SYSTEM	ONE TIME	1970-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SHOW EVENTS LIKE 'ev3'|
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -2715,7 +2715,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2728,7 +2728,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2741,7 +2741,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2754,7 +2754,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
@@ -2781,27 +2781,27 @@ END|
 CALL p1()|
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 SHOW CREATE TABLE t1|
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 
 CALL mysqltest2.p2()|
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 SHOW CREATE TABLE mysqltest2.t2|
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+  `col1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
 
 ALTER DATABASE mysqltest1 COLLATE cp1251_general_cs|
 ALTER DATABASE mysqltest2 COLLATE cp1251_general_cs|
diff --git a/mysql-test/main/ddl_i18n_utf8.test b/mysql-test/main/ddl_i18n_utf8.test
index 2e6944d8b86..35b341ddc80 100644
--- a/mysql-test/main/ddl_i18n_utf8.test
+++ b/mysql-test/main/ddl_i18n_utf8.test
@@ -38,7 +38,7 @@ set sql_mode="";
 --source include/have_cp866.inc
 --source include/have_cp1251.inc
 --source include/have_koi8r.inc
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 ###########################################################################
diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result
index 0d2c2e6acbc..492cda6b9f5 100644
--- a/mysql-test/main/default.result
+++ b/mysql-test/main/default.result
@@ -901,7 +901,7 @@ CREATE TABLE t1 (a VARCHAR(2) DEFAULT CONCAT(_utf8 0x41) NOT NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(2) NOT NULL DEFAULT concat(_utf8'A')
+  `a` varchar(2) NOT NULL DEFAULT concat(_utf8mb3'A')
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (DEFAULT);
 SELECT * FROM t1;
@@ -912,7 +912,7 @@ CREATE TABLE t1 (a VARCHAR(2) DEFAULT CONCAT(_utf8 X'41') NOT NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(2) NOT NULL DEFAULT concat(_utf8'A')
+  `a` varchar(2) NOT NULL DEFAULT concat(_utf8mb3'A')
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES (DEFAULT);
 SELECT * FROM t1;
@@ -2232,7 +2232,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(10) DEFAULT NULL,
   `b` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT `a`,
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT convert(`a` using utf8),
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT convert(`a` using utf8mb3),
   `d` varbinary(10) DEFAULT (cast(`a` as char charset binary))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 (a) VALUES ('a');
diff --git a/mysql-test/main/dyncol.result b/mysql-test/main/dyncol.result
index 4241c10d96c..7bc011ece87 100644
--- a/mysql-test/main/dyncol.result
+++ b/mysql-test/main/dyncol.result
@@ -157,7 +157,7 @@ select hex(COLUMN_CREATE(1, "afaf" AS char character set utf8,
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select hex(column_create(1,'afaf' AS char charset utf8 ,2,1212 AS unsigned int,3,1212 AS int,4,12.12 AS double,4 + 1,12.12 AS decimal,6,'2011-04-05' AS date,7,'- 0:45:49.000001' AS time,8,'2011-04-05 0:45:49.000001' AS datetime)) AS `hex(COLUMN_CREATE(1, "afaf" AS char character set utf8,
+Note	1003	select hex(column_create(1,'afaf' AS char charset utf8mb3 ,2,1212 AS unsigned int,3,1212 AS int,4,12.12 AS double,4 + 1,12.12 AS decimal,6,'2011-04-05' AS date,7,'- 0:45:49.000001' AS time,8,'2011-04-05 0:45:49.000001' AS datetime)) AS `hex(COLUMN_CREATE(1, "afaf" AS char character set utf8,
 2, 1212 AS unsigned int,
 3, 1212 AS int,
 4, 12.12 AS double,
@@ -368,7 +368,7 @@ select column_get(column_create(1, "1212" AS char charset utf8), 1 as char chars
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select column_get(column_create(1,'1212' AS char charset utf8 ),1 as char charset utf8) AS `column_get(column_create(1, "1212" AS char charset utf8), 1 as char charset utf8)`
+Note	1003	select column_get(column_create(1,'1212' AS char charset utf8mb3 ),1 as char charset utf8mb3) AS `column_get(column_create(1, "1212" AS char charset utf8), 1 as char charset utf8)`
 select column_get(column_create(1, 1212 AS unsigned int), 1 as char charset utf8);
 column_get(column_create(1, 1212 AS unsigned int), 1 as char charset utf8)
 1212
@@ -428,7 +428,7 @@ select column_get(column_create(1, "1212" AS char charset utf8), 1 as char chars
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select column_get(column_create(1,'1212' AS char charset utf8 ),1 as char charset binary) AS `column_get(column_create(1, "1212" AS char charset utf8), 1 as char charset binary)`
+Note	1003	select column_get(column_create(1,'1212' AS char charset utf8mb3 ),1 as char charset binary) AS `column_get(column_create(1, "1212" AS char charset utf8), 1 as char charset binary)`
 #
 # column get real
 #
@@ -1901,7 +1901,7 @@ drop table t1;
 create view v1 as select column_get(column_add(column_create(1 , 'blue' as char), 2, 'ttt'), 1 as char);
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select column_get(column_add(column_create(1,'blue' AS char charset utf8 ),2,'ttt'),1 as char charset utf8) AS `Name_exp_1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select column_get(column_add(column_create(1,'blue' AS char charset utf8mb3 ),2,'ttt'),1 as char charset utf8mb3) AS `Name_exp_1`	utf8mb3	utf8mb3_general_ci
 select * from v1;
 Name_exp_1
 blue
@@ -1929,9 +1929,9 @@ t1	CREATE TABLE `t1` (
   `name` varchar(10) DEFAULT NULL,
   `value` varchar(10) DEFAULT NULL,
   `dyncol0` blob DEFAULT column_create(`name`,`value`),
-  `value_dyncol0_name0` varchar(10) DEFAULT (column_get(`dyncol0`,'name0' as char charset utf8)),
+  `value_dyncol0_name0` varchar(10) DEFAULT (column_get(`dyncol0`,'name0' as char charset utf8mb3)),
   `dyncol1` blob DEFAULT column_add(`dyncol0`,'name1','value1'),
-  `value_dyncol1_name1` varchar(10) DEFAULT (column_get(`dyncol1`,'name1' as char charset utf8)),
+  `value_dyncol1_name1` varchar(10) DEFAULT (column_get(`dyncol1`,'name1' as char charset utf8mb3)),
   `dyncol2` blob DEFAULT column_add(`dyncol1`,'name1',NULL AS int),
   `dyncol2_exists_name0` int(11) DEFAULT column_exists(`dyncol2`,'name0'),
   `dyncol2_exists_name1` int(11) DEFAULT column_exists(`dyncol2`,'name1'),
diff --git a/mysql-test/main/empty_string_literal.result b/mysql-test/main/empty_string_literal.result
index bbcf27cf993..bf9f30665f2 100644
--- a/mysql-test/main/empty_string_literal.result
+++ b/mysql-test/main/empty_string_literal.result
@@ -31,17 +31,17 @@ latin2	NULL
 SET sql_mode=@mode;
 SELECT N'',CHARSET(N''), N'x', CHARSET(N'x');
 NULL	CHARSET(N'')	x	CHARSET(N'x')
-NULL	utf8	x	utf8
+NULL	utf8mb3	x	utf8mb3
 SELECT CHARSET(NULLIF(N'',N'')),NULLIF(N'',N'');
 CHARSET(NULLIF(N'',N''))	NULLIF(N'',N'')
-utf8	NULL
+utf8mb3	NULL
 SET sql_mode=default;
 SELECT N'',CHARSET(N''), N'x', CHARSET(N'x');
 	CHARSET(N'')	x	CHARSET(N'x')
-	utf8	x	utf8
+	utf8mb3	x	utf8mb3
 SELECT CHARSET(NULLIF(N'',N'')),NULLIF(N'',N'');
 CHARSET(NULLIF(N'',N''))	NULLIF(N'',N'')
-utf8	NULL
+utf8mb3	NULL
 #
 # Test CHARSET prefix litteral
 #
@@ -98,7 +98,7 @@ NULL	CHARSET(_latin1'' '' '')
 NULL	latin1
 SELECT N'' '' '',CHARSET(N'' '' '');
 NULL	CHARSET(N'' '' '')
-NULL	utf8
+NULL	utf8mb3
 #
 # UNION - implicit group by
 #
diff --git a/mysql-test/main/events_1.result b/mysql-test/main/events_1.result
index 26611abb880..c425f88eab2 100644
--- a/mysql-test/main/events_1.result
+++ b/mysql-test/main/events_1.result
@@ -150,109 +150,109 @@ Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root6;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root6		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND STARTS '#' ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root6		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND STARTS '#' ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root7 on schedule every 2 year do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root7;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root7		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root7` ON SCHEDULE EVERY 2 YEAR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root7		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root7` ON SCHEDULE EVERY 2 YEAR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root8 on schedule every '2:5' year_month do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root8;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root8		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root8		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root8_1 on schedule every '2:15' year_month do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root8_1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root8_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root8_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root9 on schedule every 2 week ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root9;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root9		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root9` ON SCHEDULE EVERY 2 WEEK STARTS '#' ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root9		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root9` ON SCHEDULE EVERY 2 WEEK STARTS '#' ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root10 on schedule every '20:5' day_hour do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root10;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root10		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root10` ON SCHEDULE EVERY '20 5' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root10		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root10` ON SCHEDULE EVERY '20 5' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root11 on schedule every '20:25' day_hour do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root11;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root11		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root11` ON SCHEDULE EVERY '21 1' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root11		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root11` ON SCHEDULE EVERY '21 1' DAY_HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root12 on schedule every '20:25' hour_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root12;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root12		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root12		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root13 on schedule every '25:25' hour_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root13;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root13		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root13		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root13_1 on schedule every '11:65' hour_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root13_1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root13_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root13_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root14 on schedule every '35:35' minute_second do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root14;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root14		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root14		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root15 on schedule every '35:66' minute_second do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root15;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root15		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root15		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root16 on schedule every '35:56' day_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root16;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root16		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root16		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root17 on schedule every '35:12:45' day_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root17;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root17		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root17		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root17_1 on schedule every '35:25:65' day_minute do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root17_1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root17_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root17_1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root18 on schedule every '35:12:45' hour_second do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root18;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root18		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root18		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root19 on schedule every '15:59:85' hour_second do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root19;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root19		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root19		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 create event root20 on schedule every '50:20:12:45' day_second do select 1;
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 SHOW CREATE EVENT root20;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-root20		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+root20		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 set names cp1251;
 create event ����21 on schedule every '50:23:59:95' day_second COMMENT '���� � 1251 ��������' do select 1;
 Warnings:
diff --git a/mysql-test/main/events_2.result b/mysql-test/main/events_2.result
index ec8dc0ff305..1753fa41ad0 100644
--- a/mysql-test/main/events_2.result
+++ b/mysql-test/main/events_2.result
@@ -145,7 +145,7 @@ Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON
 lock table t1 read;
 show create event e1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 select event_name from information_schema.events;
 event_name
 e1
@@ -163,7 +163,7 @@ unlock tables;
 lock table t1 write;
 show create event e1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 select event_name from information_schema.events;
 event_name
 e1
@@ -181,7 +181,7 @@ unlock tables;
 lock table t1 read, mysql.event read;
 show create event e1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 select event_name from information_schema.events;
 event_name
 e1
@@ -199,7 +199,7 @@ unlock tables;
 lock table t1 write, mysql.event read;
 show create event e1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 select event_name from information_schema.events;
 event_name
 e1
@@ -221,7 +221,7 @@ ERROR HY000: You can't combine write-locking of system tables with other tables
 lock table mysql.event write;
 show create event e1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+e1		SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 select event_name from information_schema.events;
 event_name
 e1
diff --git a/mysql-test/main/explain_json.result b/mysql-test/main/explain_json.result
index 18a15795aab..98a2fec91fa 100644
--- a/mysql-test/main/explain_json.result
+++ b/mysql-test/main/explain_json.result
@@ -1110,7 +1110,7 @@ EXPLAIN
       "access_type": "ALL",
       "rows": 2,
       "filtered": 100,
-      "attached_condition": "(case when convert(t1.a using utf8) = <cache>(_utf8'a' collate utf8_bin) then NULL else t1.a end)"
+      "attached_condition": "(case when convert(t1.a using utf8mb3) = <cache>(_utf8mb3'a' collate utf8mb3_bin) then NULL else t1.a end)"
     }
   }
 }
diff --git a/mysql-test/main/frm_bad_row_type-7333.result b/mysql-test/main/frm_bad_row_type-7333.result
index 48404b1ba97..f1ce23bc457 100644
--- a/mysql-test/main/frm_bad_row_type-7333.result
+++ b/mysql-test/main/frm_bad_row_type-7333.result
@@ -7,8 +7,8 @@ bad_row_type	CREATE TABLE `bad_row_type` (
   `category_id` int(11) NOT NULL AUTO_INCREMENT,
   `category_name` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`category_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 /* `compression`='tokudb_zlib' */
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 /* `compression`='tokudb_zlib' */
 show table status like 'bad_row_type';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-bad_row_type	MyISAM	10	Dynamic	0	0	0	281474976710655	1024	0	1	x	x	NULL	utf8_general_ci	NULL	`compression`='tokudb_zlib'		x	N
+bad_row_type	MyISAM	10	Dynamic	0	0	0	281474976710655	1024	0	1	x	x	NULL	utf8mb3_general_ci	NULL	`compression`='tokudb_zlib'		x	N
 drop table bad_row_type;
diff --git a/mysql-test/main/fulltext.result b/mysql-test/main/fulltext.result
index 343458c4267..6f294eb4631 100644
--- a/mysql-test/main/fulltext.result
+++ b/mysql-test/main/fulltext.result
@@ -362,10 +362,10 @@ INSERT t1 VALUES ("��� �� - ������"),("������, �����!"),
 ("�� ������, �����!"),("� ����� ����!");
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('������');
 t	collation(t)
-��� �� - ������	utf8_general_ci
+��� �� - ������	utf8mb3_general_ci
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('���*' IN BOOLEAN MODE);
 t	collation(t)
-� ����� ����!	utf8_general_ci
+� ����� ����!	utf8mb3_general_ci
 SELECT * FROM t1 WHERE MATCH t AGAINST ('���' IN BOOLEAN MODE);
 t
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabr�ck');
@@ -373,12 +373,12 @@ t	collation(t)
 SET NAMES latin1;
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabr�ck');
 t	collation(t)
-aus Osnabr�ck	utf8_general_ci
+aus Osnabr�ck	utf8mb3_general_ci
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrueck');
 t	collation(t)
 SELECT t, collation(t),FORMAT(MATCH t AGAINST ('Osnabruck'),6) FROM t1 WHERE MATCH t AGAINST ('Osnabruck');
 t	collation(t)	FORMAT(MATCH t AGAINST ('Osnabruck'),6)
-aus Osnabr�ck	utf8_general_ci	1.591140
+aus Osnabr�ck	utf8mb3_general_ci	1.591140
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 alter table t1 modify t varchar(200) collate latin1_german2_ci not null;
 Warnings:
diff --git a/mysql-test/main/fulltext.test b/mysql-test/main/fulltext.test
index d52f13ab978..c7aeae3fa31 100644
--- a/mysql-test/main/fulltext.test
+++ b/mysql-test/main/fulltext.test
@@ -2,7 +2,7 @@
 # Test of fulltext index
 #
 
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 --disable_warnings
diff --git a/mysql-test/main/fulltext2.test b/mysql-test/main/fulltext2.test
index 78c7c859e95..dc7af398bb6 100644
--- a/mysql-test/main/fulltext2.test
+++ b/mysql-test/main/fulltext2.test
@@ -2,7 +2,7 @@
 # test of new fulltext search features
 #
 
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 #
diff --git a/mysql-test/main/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result
index 4be42cee523..16bd0359da2 100644
--- a/mysql-test/main/func_hybrid_type.result
+++ b/mysql-test/main/func_hybrid_type.result
@@ -3145,8 +3145,8 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
-  `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1,
@@ -3196,9 +3196,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
-  `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
-  `c3` text CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` text CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1,
@@ -3240,7 +3240,7 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1
@@ -3315,8 +3315,8 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
-  `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c1:=c1 AS c1,
@@ -3364,9 +3364,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
-  `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
-  `c3` text CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` text CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c:=c1 AS c1,
@@ -3406,7 +3406,7 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c:=c1 AS c1
@@ -3492,8 +3492,8 @@ COALESCE(_latin1'aaa',_utf8 0xC39F) AS c2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(3) CHARACTER SET utf8 NOT NULL,
-  `c2` varchar(3) CHARACTER SET utf8 NOT NULL
+  `c1` varchar(3) CHARACTER SET utf8mb3 NOT NULL,
+  `c2` varchar(3) CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM t1;
 c1	c2
diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result
index 3b0688fc70e..4544a1df71c 100644
--- a/mysql-test/main/func_regexp_pcre.result
+++ b/mysql-test/main/func_regexp_pcre.result
@@ -436,7 +436,7 @@ CREATE TABLE t1 AS SELECT REGEXP_REPLACE('abc','b','x');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8 DEFAULT NULL
+  `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 EXPLAIN EXTENDED SELECT REGEXP_REPLACE('abc','b','x');
@@ -739,7 +739,7 @@ CREATE TABLE t1 AS SELECT REGEXP_SUBSTR('abc','b');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8 DEFAULT NULL
+  `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 EXPLAIN EXTENDED SELECT REGEXP_SUBSTR('abc','b');
diff --git a/mysql-test/main/func_str.result b/mysql-test/main/func_str.result
index d354bdf1220..dc787219b73 100644
--- a/mysql-test/main/func_str.result
+++ b/mysql-test/main/func_str.result
@@ -2461,12 +2461,12 @@ SELECT CHAR(0xff,0x8f USING utf8);
 CHAR(0xff,0x8f USING utf8)
 NULL
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF8F'
+Warning	1300	Invalid utf8mb3 character string: 'FF8F'
 SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
 CHAR(0xff,0x8f USING utf8) IS NULL
 1
 Warnings:
-Warning	1300	Invalid utf8 character string: 'FF8F'
+Warning	1300	Invalid utf8mb3 character string: 'FF8F'
 SET SQL_MODE=@orig_sql_mode;
 select substring('abc', cast(2 as unsigned int));
 substring('abc', cast(2 as unsigned int))
@@ -5031,10 +5031,10 @@ create database mysqltest1 CHARACTER SET = 'utf8' COLLATE = 'utf8_bin';
 use mysqltest1;
 select charset(chr(65)), length(chr(65)),char_length(chr(65));
 charset(chr(65))	length(chr(65))	char_length(chr(65))
-utf8	1	1
+utf8mb3	1	1
 select charset(chr(14844588)), length(chr(14844588)),char_length(chr(14844588));
 charset(chr(14844588))	length(chr(14844588))	char_length(chr(14844588))
-utf8	3	1
+utf8mb3	3	1
 drop database mysqltest1;
 use test;
 #
@@ -5086,9 +5086,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+  `cn` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, t2;
 #
@@ -5104,9 +5104,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+  `cn` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, t2;
 CREATE TABLE t1 (i BIGINT);
@@ -5119,9 +5119,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+  `cn` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, t2;
 CREATE TABLE t1 (i BIGINT);
@@ -5134,9 +5134,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c1` char(0) CHARACTER SET utf8 DEFAULT NULL
+  `cn` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c1` char(0) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, t2;
 CREATE TABLE t1 (i BIGINT);
@@ -5149,9 +5149,9 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `cn` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c0` char(0) CHARACTER SET utf8 DEFAULT NULL,
-  `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL
+  `cn` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c0` char(0) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c1` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT c1 FROM t2;
 c1
@@ -5175,7 +5175,7 @@ conv(i,16,2)
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `conv(i,16,2)` varchar(64) CHARACTER SET utf8 DEFAULT NULL
+  `conv(i,16,2)` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1,t2;
 #
diff --git a/mysql-test/main/func_system.result b/mysql-test/main/func_system.result
index 3720cac0b2e..6d80a439030 100644
--- a/mysql-test/main/func_system.result
+++ b/mysql-test/main/func_system.result
@@ -3,7 +3,7 @@ database()
 test
 select charset(database());
 charset(database())
-utf8
+utf8mb3
 select database() = "test";
 database() = "test"
 1
@@ -24,7 +24,7 @@ user() like _latin1"%@%"
 1
 select charset(user());
 charset(user())
-utf8
+utf8mb3
 select version()>="03.23.29";
 version()>="03.23.29"
 1
@@ -36,7 +36,7 @@ version()>=_latin1"03.23.29"
 1
 select charset(version());
 charset(version())
-utf8
+utf8mb3
 explain extended select database(), user();
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -46,23 +46,23 @@ create table t1 (version char(60)) select database(), user(), version() as 'vers
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL,
-  `user()` varchar(384) CHARACTER SET utf8 DEFAULT NULL,
+  `database()` varchar(34) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `user()` varchar(384) CHARACTER SET utf8mb3 DEFAULT NULL,
   `version` char(60) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
 charset(charset(_utf8'a'))	charset(collation(_utf8'a'))
-utf8	utf8
+utf8mb3	utf8mb3
 select collation(charset(_utf8'a')), collation(collation(_utf8'a'));
 collation(charset(_utf8'a'))	collation(collation(_utf8'a'))
-utf8_general_ci	utf8_general_ci
+utf8mb3_general_ci	utf8mb3_general_ci
 create table t1 select charset(_utf8'a'), collation(_utf8'a');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `charset(_utf8'a')` varchar(64) CHARACTER SET utf8 DEFAULT NULL,
-  `collation(_utf8'a')` varchar(64) CHARACTER SET utf8 DEFAULT NULL
+  `charset(_utf8'a')` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `collation(_utf8'a')` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select TRUE,FALSE,NULL;
diff --git a/mysql-test/main/get_diagnostics.result b/mysql-test/main/get_diagnostics.result
index ca495d6954d..bcecce95a00 100644
--- a/mysql-test/main/get_diagnostics.result
+++ b/mysql-test/main/get_diagnostics.result
@@ -776,10 +776,10 @@ Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value
 GET DIAGNOSTICS CONDITION 1 @var1 = MESSAGE_TEXT, @var2 = CLASS_ORIGIN;
 SELECT CHARSET(@var1), COLLATION(@var1), COERCIBILITY(@var1);
 CHARSET(@var1)	COLLATION(@var1)	COERCIBILITY(@var1)
-utf8	utf8_general_ci	2
+utf8mb3	utf8mb3_general_ci	2
 SELECT CHARSET(@var2), COLLATION(@var2), COERCIBILITY(@var2);
 CHARSET(@var2)	COLLATION(@var2)	COERCIBILITY(@var2)
-utf8	utf8_general_ci	2
+utf8mb3	utf8mb3_general_ci	2
 #
 # Command statistics
 #
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 8bcb98143a2..2756dffff17 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -1759,7 +1759,7 @@ GEOMETRY_COLUMNS	CREATE TEMPORARY TABLE `GEOMETRY_COLUMNS` (
   `COORD_DIMENSION` tinyint(2) NOT NULL DEFAULT 0,
   `MAX_PPR` tinyint(2) NOT NULL DEFAULT 0,
   `SRID` smallint(5) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 SHOW CREATE TABLE information_schema.spatial_ref_sys;
 Table	Create Table
 SPATIAL_REF_SYS	CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
@@ -1767,7 +1767,7 @@ SPATIAL_REF_SYS	CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
   `AUTH_NAME` varchar(512) NOT NULL DEFAULT '',
   `AUTH_SRID` int(5) NOT NULL DEFAULT 0,
   `SRTEXT` varchar(2048) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 create table t1(g GEOMETRY, pt POINT);
 create table t2(g LINESTRING, pl POLYGON);
 select * from information_schema.geometry_columns where f_table_schema='test';
diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result
index 28cb26e0a49..2a57f38bd32 100644
--- a/mysql-test/main/information_schema.result
+++ b/mysql-test/main/information_schema.result
@@ -13,8 +13,8 @@ select * from information_schema.SCHEMATA where schema_name > 'm';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
 def	mtr	latin1	latin1_swedish_ci	NULL	
 def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL	
-def	sys	utf8	utf8_general_ci	NULL	
+def	performance_schema	utf8mb3	utf8mb3_general_ci	NULL	
+def	sys	utf8mb3	utf8mb3_general_ci	NULL	
 def	test	latin1	latin1_swedish_ci	NULL	
 select schema_name from information_schema.schemata;
 schema_name
@@ -225,10 +225,10 @@ Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 a	int(11)	NULL	YES	MUL	NULL		select,insert,update,references	
 show full columns from mysql.db like "Insert%";
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-Insert_priv	enum('N','Y')	utf8_general_ci	NO		N		select,insert,update,references	
+Insert_priv	enum('N','Y')	utf8mb3_general_ci	NO		N		select,insert,update,references	
 show full columns from v1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	varchar(64)	utf8_general_ci	NO				select,insert,update,references	
+c	varchar(64)	utf8mb3_general_ci	NO				select,insert,update,references	
 select * from information_schema.COLUMNS where table_name="t1"
 and column_name= "a";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
@@ -611,7 +611,7 @@ CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
   `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 set names latin2;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
@@ -620,7 +620,7 @@ CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
   `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 set names latin1;
 create table t1 select * from information_schema.CHARACTER_SETS
 where CHARACTER_SET_NAME like "latin1";
@@ -635,7 +635,7 @@ t1	CREATE TABLE `t1` (
   `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT 0
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 drop table t1;
 create view v1 as select * from information_schema.TABLES;
 drop view v1;
@@ -1163,7 +1163,7 @@ drop procedure p1;
 drop procedure p2;
 show create database information_schema;
 Database	Create Database
-information_schema	CREATE DATABASE `information_schema` /*!40100 DEFAULT CHARACTER SET utf8 */
+information_schema	CREATE DATABASE `information_schema` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 create table t1(f1 LONGBLOB, f2 LONGTEXT);
 select column_name,data_type,CHARACTER_OCTET_LENGTH,
 CHARACTER_MAXIMUM_LENGTH
@@ -1744,7 +1744,7 @@ information_schema
 SELECT TABLE_COLLATION FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
 TABLE_COLLATION
-utf8_bin
+utf8mb3_bin
 select * from information_schema.columns where table_schema = NULL;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
 select * from `information_schema`.`COLUMNS` where `TABLE_NAME` = NULL;
diff --git a/mysql-test/main/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result
index 02f97159f28..fd2be07326c 100644
--- a/mysql-test/main/information_schema_parameters.result
+++ b/mysql-test/main/information_schema_parameters.result
@@ -19,7 +19,7 @@ PARAMETERS	CREATE TEMPORARY TABLE `PARAMETERS` (
   `COLLATION_NAME` varchar(64) DEFAULT NULL,
   `DTD_IDENTIFIER` longtext NOT NULL DEFAULT '',
   `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT ''
-)  DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8mb3
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
   AND table_name   = 'parameters'
@@ -37,8 +37,8 @@ CHARACTER_OCTET_LENGTH	1536
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(512)
 COLUMN_KEY	
 EXTRA	
@@ -59,8 +59,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -81,8 +81,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -125,8 +125,8 @@ CHARACTER_OCTET_LENGTH	15
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(5)
 COLUMN_KEY	
 EXTRA	
@@ -147,8 +147,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -169,8 +169,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -301,8 +301,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -323,8 +323,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -345,8 +345,8 @@ CHARACTER_OCTET_LENGTH	4294967295
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	longtext
 COLUMN_KEY	
 EXTRA	
@@ -367,8 +367,8 @@ CHARACTER_OCTET_LENGTH	27
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(9)
 COLUMN_KEY	
 EXTRA	
@@ -521,8 +521,8 @@ RETURN CONCAT('XYZ, ' ,s);
 SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
 WHERE SPECIFIC_SCHEMA = 'i_s_parameters_test' AND SPECIFIC_NAME = 'test_func5';
 SPECIFIC_CATALOG	SPECIFIC_SCHEMA	SPECIFIC_NAME	ORDINAL_POSITION	PARAMETER_MODE	PARAMETER_NAME	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_TYPE
-def	i_s_parameters_test	test_func5	0	NULL	NULL	varchar	30	90	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(30)	FUNCTION
-def	i_s_parameters_test	test_func5	1	IN	s	char	20	60	NULL	NULL	NULL	utf8	utf8_general_ci	char(20)	FUNCTION
+def	i_s_parameters_test	test_func5	0	NULL	NULL	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)	FUNCTION
+def	i_s_parameters_test	test_func5	1	IN	s	char	20	60	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	char(20)	FUNCTION
 DROP DATABASE i_s_parameters_test;
 USE test;
 #
diff --git a/mysql-test/main/information_schema_routines.result b/mysql-test/main/information_schema_routines.result
index 6b67a0bcdcf..9f1f1f16bcf 100644
--- a/mysql-test/main/information_schema_routines.result
+++ b/mysql-test/main/information_schema_routines.result
@@ -36,7 +36,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
   `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
-)  DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8mb3
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
   AND table_name   = 'routines'
@@ -54,8 +54,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -76,8 +76,8 @@ CHARACTER_OCTET_LENGTH	1536
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(512)
 COLUMN_KEY	
 EXTRA	
@@ -98,8 +98,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -120,8 +120,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -142,8 +142,8 @@ CHARACTER_OCTET_LENGTH	39
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(13)
 COLUMN_KEY	
 EXTRA	
@@ -164,8 +164,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -296,8 +296,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -318,8 +318,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -340,8 +340,8 @@ CHARACTER_OCTET_LENGTH	4294967295
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	longtext
 COLUMN_KEY	
 EXTRA	
@@ -362,8 +362,8 @@ CHARACTER_OCTET_LENGTH	24
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(8)
 COLUMN_KEY	
 EXTRA	
@@ -384,8 +384,8 @@ CHARACTER_OCTET_LENGTH	4294967295
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	longtext
 COLUMN_KEY	
 EXTRA	
@@ -406,8 +406,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -428,8 +428,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -450,8 +450,8 @@ CHARACTER_OCTET_LENGTH	24
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(8)
 COLUMN_KEY	
 EXTRA	
@@ -472,8 +472,8 @@ CHARACTER_OCTET_LENGTH	9
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(3)
 COLUMN_KEY	
 EXTRA	
@@ -494,8 +494,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -516,8 +516,8 @@ CHARACTER_OCTET_LENGTH	192
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(64)
 COLUMN_KEY	
 EXTRA	
@@ -538,8 +538,8 @@ CHARACTER_OCTET_LENGTH	21
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(7)
 COLUMN_KEY	
 EXTRA	
@@ -604,8 +604,8 @@ CHARACTER_OCTET_LENGTH	24576
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(8192)
 COLUMN_KEY	
 EXTRA	
@@ -626,8 +626,8 @@ CHARACTER_OCTET_LENGTH	4294967295
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	longtext
 COLUMN_KEY	
 EXTRA	
@@ -648,8 +648,8 @@ CHARACTER_OCTET_LENGTH	1152
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(384)
 COLUMN_KEY	
 EXTRA	
@@ -670,8 +670,8 @@ CHARACTER_OCTET_LENGTH	96
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(32)
 COLUMN_KEY	
 EXTRA	
@@ -692,8 +692,8 @@ CHARACTER_OCTET_LENGTH	96
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(32)
 COLUMN_KEY	
 EXTRA	
@@ -714,8 +714,8 @@ CHARACTER_OCTET_LENGTH	96
 NUMERIC_PRECISION	NULL
 NUMERIC_SCALE	NULL
 DATETIME_PRECISION	NULL
-CHARACTER_SET_NAME	utf8
-COLLATION_NAME	utf8_general_ci
+CHARACTER_SET_NAME	utf8mb3
+COLLATION_NAME	utf8mb3_general_ci
 COLUMN_TYPE	varchar(32)
 COLUMN_KEY	
 EXTRA	
@@ -849,5 +849,5 @@ RETURN CONCAT('XYZ, ' ,s);
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = 'i_s_routines_test' AND ROUTINE_NAME = 'test_func5';
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-test_func5	def	i_s_routines_test	test_func5	FUNCTION	varchar	30	90	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(30)	SQL	RETURN CONCAT('XYZ, ' ,s)	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	<created>	<modified>			root@localhost	latin1	latin1_swedish_ci	utf8_general_ci
+test_func5	def	i_s_routines_test	test_func5	FUNCTION	varchar	30	90	NULL	NULL	NULL	utf8mb3	utf8mb3_general_ci	varchar(30)	SQL	RETURN CONCAT('XYZ, ' ,s)	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	<created>	<modified>			root@localhost	latin1	latin1_swedish_ci	utf8mb3_general_ci
 DROP DATABASE i_s_routines_test;
diff --git a/mysql-test/main/innodb_utf8.test b/mysql-test/main/innodb_utf8.test
index e52019588b0..b6ea12b02bb 100644
--- a/mysql-test/main/innodb_utf8.test
+++ b/mysql-test/main/innodb_utf8.test
@@ -3,7 +3,7 @@
 #
 
 --source include/have_innodb.inc
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 # Setup
diff --git a/mysql-test/main/join.result b/mysql-test/main/join.result
index 8e0212c00b7..c78cb8b45c7 100644
--- a/mysql-test/main/join.result
+++ b/mysql-test/main/join.result
@@ -757,8 +757,8 @@ statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statist
 columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_NULLABLE, columns.DATA_TYPE, columns.CHARACTER_MAXIMUM_LENGTH, columns.CHARACTER_OCTET_LENGTH, columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE, columns.CHARACTER_SET_NAME, columns.COLLATION_NAME, columns.COLUMN_TYPE, columns.COLUMN_KEY, columns.EXTRA, columns.COLUMN_COMMENT
 from information_schema.statistics join information_schema.columns using(table_name,column_name) where table_name='global_priv';
 TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	COLUMN_COMMENT
-global_priv	Host	def	mysql	0	mysql	PRIMARY	1	A	NULL	NULL		BTREE		def	mysql	''	NO	char	255	765	NULL	NULL	utf8	utf8_bin	char(255)	PRI		
-global_priv	User	def	mysql	0	mysql	PRIMARY	2	A	NULL	NULL		BTREE		def	mysql	''	NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)	PRI		
+global_priv	Host	def	mysql	0	mysql	PRIMARY	1	A	NULL	NULL		BTREE		def	mysql	''	NO	char	255	765	NULL	NULL	utf8mb3	utf8mb3_bin	char(255)	PRI		
+global_priv	User	def	mysql	0	mysql	PRIMARY	2	A	NULL	NULL		BTREE		def	mysql	''	NO	char	128	384	NULL	NULL	utf8mb3	utf8mb3_bin	char(128)	PRI		
 Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
diff --git a/mysql-test/main/key.result b/mysql-test/main/key.result
index c35dbbc4754..5d84068d8af 100644
--- a/mysql-test/main/key.result
+++ b/mysql-test/main/key.result
@@ -242,8 +242,8 @@ create table t1 (c varchar(30) character set utf8, t text character set utf8, un
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(30) CHARACTER SET utf8 DEFAULT NULL,
-  `t` text CHARACTER SET utf8 DEFAULT NULL,
+  `c` varchar(30) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `t` text CHARACTER SET utf8mb3 DEFAULT NULL,
   UNIQUE KEY `c` (`c`(2)),
   UNIQUE KEY `t` (`t`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result
index f136e9e99ab..d29482ceffa 100644
--- a/mysql-test/main/locale.result
+++ b/mysql-test/main/locale.result
@@ -111,9 +111,9 @@ Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 SET lc_time_names=ru_RU;
 SELECT c FROM t1 WHERE DAYNAME(d)<>c;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>'
+ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>'
 SELECT c FROM t1 WHERE MONTHNAME(d)<>c;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>'
+ERROR HY000: Illegal mix of collations (utf8mb3_general_ci,COERCIBLE) and (latin1_swedish_ci,IMPLICIT) for operation '<>'
 SET lc_time_names=en_US;
 SELECT c FROM t1 WHERE DAYNAME(d)<>c;
 c
@@ -238,7 +238,7 @@ a	a1	b	b1
 10 Oct October	10 Окт Октября	123,456,789.00	123'456'789,00
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8mb3	utf8mb3_general_ci
 drop view v1;
 #
 # End of 10.2 tests
diff --git a/mysql-test/main/log_tables.result b/mysql-test/main/log_tables.result
index 914bc06748e..4642b1c6876 100644
--- a/mysql-test/main/log_tables.result
+++ b/mysql-test/main/log_tables.result
@@ -57,7 +57,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show fields from mysql.general_log;
 Field	Type	Null	Key	Default	Extra
 event_time	timestamp(6)	NO		current_timestamp(6)	on update current_timestamp(6)
@@ -82,7 +82,7 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 show fields from mysql.slow_log;
 Field	Type	Null	Key	Default	Extra
 start_time	timestamp(6)	NO		current_timestamp(6)	on update current_timestamp(6)
@@ -172,7 +172,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table mysql.slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -189,7 +189,7 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 alter table mysql.general_log engine=myisam;
 alter table mysql.slow_log engine=myisam;
 show create table mysql.general_log;
@@ -201,7 +201,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table mysql.slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -218,7 +218,7 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 set global general_log='ON';
 set global slow_query_log='ON';
 select * from mysql.general_log;
diff --git a/mysql-test/main/lowercase_table5.result b/mysql-test/main/lowercase_table5.result
index 9adfd0590a8..de46db3593b 100644
--- a/mysql-test/main/lowercase_table5.result
+++ b/mysql-test/main/lowercase_table5.result
@@ -1,13 +1,13 @@
 CREATE DATABASE mysql_TEST CHARACTER SET utf8;
 SHOW CREATE DATABASE mysql_TEST;
 Database	Create Database
-mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8 */
+mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 CREATE DATABASE mysql_test CHARACTER SET latin2;
 SHOW CREATE DATABASE mysql_test;
 Database	Create Database
 mysql_test	CREATE DATABASE `mysql_test` /*!40100 DEFAULT CHARACTER SET latin2 */
 SHOW CREATE DATABASE mysql_TEST;
 Database	Create Database
-mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8 */
+mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 DROP DATABASE mysql_test;
 DROP DATABASE mysql_TEST;
diff --git a/mysql-test/main/mix2_myisam.result b/mysql-test/main/mix2_myisam.result
index dd2af645767..5534511255d 100644
--- a/mysql-test/main/mix2_myisam.result
+++ b/mysql-test/main/mix2_myisam.result
@@ -1957,7 +1957,7 @@ 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
+  `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
@@ -2009,7 +2009,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `v` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set default_storage_engine=MEMORY;
diff --git a/mysql-test/main/mrr_icp_extra.result b/mysql-test/main/mrr_icp_extra.result
index f0c284762c6..a8c9bfc201a 100644
--- a/mysql-test/main/mrr_icp_extra.result
+++ b/mysql-test/main/mrr_icp_extra.result
@@ -758,7 +758,7 @@ 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
+  `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result
index 0f68171c6c2..3d8ee7c35a3 100644
--- a/mysql-test/main/myisam.result
+++ b/mysql-test/main/myisam.result
@@ -1673,7 +1673,7 @@ 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
+  `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
@@ -1725,7 +1725,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `v` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set statement sql_mode='' for
@@ -2403,7 +2403,7 @@ KEY (c2)
 
 MyISAM file:         MYSQLD_DATADIR/test/t1
 Record format:       Packed
-Character set:       utf8_general_ci (33)
+Character set:       utf8mb3_general_ci (33)
 Data records:                    0  Deleted blocks:                 0
 Recordlength:                   94
 
diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
index ef5332e2142..75b1a01ee4e 100644
--- a/mysql-test/main/mysql.result
+++ b/mysql-test/main/mysql.result
@@ -538,7 +538,7 @@ a
 #
 # End of 10.1 tests
 #
-ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81'
+ERROR 1300 (HY000) at line 2: Invalid utf8mb3 character string: 'test\xF0\x9F\x98\x81'
 set GLOBAL sql_mode=default;
 
 End of tests
diff --git a/mysql-test/main/mysql5613mysql.result b/mysql-test/main/mysql5613mysql.result
index 183af7211d3..7f4b358cdd0 100644
--- a/mysql-test/main/mysql5613mysql.result
+++ b/mysql-test/main/mysql5613mysql.result
@@ -5,56 +5,56 @@
 SHOW CREATE TABLE columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Column privileges'
 SELECT * FROM columns_priv LIMIT 0;
 Host	Db	User	Table_name	Column_name	Timestamp	Column_priv
 DROP TABLE columns_priv;
 SHOW CREATE TABLE db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Database privileges'
 SELECT * FROM db LIMIT 0;
 Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv	Trigger_priv
 DROP TABLE db;
 SHOW CREATE TABLE event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` char(77) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `execute_at` datetime DEFAULT NULL,
   `interval_value` int(11) DEFAULT NULL,
   `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
@@ -66,27 +66,27 @@ event	CREATE TABLE `event` (
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
   `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
-  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `originator` int(10) unsigned NOT NULL,
   `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Events'
 SELECT * FROM event LIMIT 0;
 db	name	body	definer	execute_at	interval_value	interval_field	created	modified	last_executed	starts	ends	status	on_completion	sql_mode	comment	originator	time_zone	character_set_client	collation_connection	db_collation	body_utf8
 DROP TABLE event;
 SHOW CREATE TABLE func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `ret` tinyint(1) NOT NULL DEFAULT 0,
-  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 NOT NULL,
   PRIMARY KEY (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='User defined functions'
 SELECT * FROM func LIMIT 0;
 name	ret	dl	type
 DROP TABLE func;
@@ -96,14 +96,14 @@ plugin	CREATE TABLE `plugin` (
   `name` varchar(64) NOT NULL DEFAULT '',
   `dl` varchar(128) NOT NULL DEFAULT '',
   PRIMARY KEY (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL plugins'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='MySQL plugins'
 SELECT * FROM plugin LIMIT 0;
 name	dl
 DROP TABLE plugin;
 SHOW CREATE TABLE proc;
 Table	Create Table
 proc	CREATE TABLE `proc` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `type` enum('FUNCTION','PROCEDURE') NOT NULL,
   `specific_name` char(64) NOT NULL DEFAULT '',
@@ -114,50 +114,50 @@ proc	CREATE TABLE `proc` (
   `param_list` blob NOT NULL,
   `returns` longblob NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` char(77) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
-  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `comment` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Stored Procedures'
 SELECT * FROM proc LIMIT 0;
 db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 DROP TABLE proc;
 SHOW CREATE TABLE procs_priv;
 Table	Create Table
 procs_priv	CREATE TABLE `procs_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL,
-  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` char(77) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Procedure privileges'
 SELECT * FROM procs_priv LIMIT 0;
 Host	Db	User	Routine_name	Routine_type	Grantor	Proc_priv	Timestamp
 DROP TABLE procs_priv;
 SHOW CREATE TABLE proxies_priv;
 Table	Create Table
 proxies_priv	CREATE TABLE `proxies_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proxied_user` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proxied_host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proxied_user` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `With_grant` tinyint(1) NOT NULL DEFAULT 0,
-  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Grantor` char(77) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User proxy privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='User proxy privileges'
 SELECT * FROM proxies_priv LIMIT 0;
 Host	User	Proxied_host	Proxied_user	With_grant	Grantor	Timestamp
 DROP TABLE proxies_priv;
@@ -174,24 +174,24 @@ servers	CREATE TABLE `servers` (
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` char(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`Server_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL Foreign Servers table'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='MySQL Foreign Servers table'
 SELECT * FROM servers LIMIT 0;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
 DROP TABLE servers;
 SHOW CREATE TABLE tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` char(77) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Table privileges'
 SELECT * FROM tables_priv LIMIT 0;
 Host	Db	User	Table_name	Grantor	Timestamp	Table_priv	Column_priv
 DROP TABLE tables_priv;
@@ -201,7 +201,7 @@ time_zone_leap_second	CREATE TABLE `time_zone_leap_second` (
   `Transition_time` bigint(20) NOT NULL,
   `Correction` int(11) NOT NULL,
   PRIMARY KEY (`Transition_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Leap seconds information for time zones'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Leap seconds information for time zones'
 SELECT * FROM time_zone_leap_second LIMIT 0;
 Transition_time	Correction
 DROP TABLE time_zone_leap_second;
@@ -211,7 +211,7 @@ time_zone	CREATE TABLE `time_zone` (
   `Time_zone_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `Use_leap_seconds` enum('Y','N') NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Time_zone_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zones'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Time zones'
 SELECT * FROM time_zone LIMIT 0;
 Time_zone_id	Use_leap_seconds
 DROP TABLE time_zone;
@@ -221,7 +221,7 @@ time_zone_name	CREATE TABLE `time_zone_name` (
   `Name` char(64) NOT NULL,
   `Time_zone_id` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone names'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Time zone names'
 SELECT * FROM time_zone_name LIMIT 0;
 Name	Time_zone_id
 DROP TABLE time_zone_name;
@@ -232,7 +232,7 @@ time_zone_transition	CREATE TABLE `time_zone_transition` (
   `Transition_time` bigint(20) NOT NULL,
   `Transition_type_id` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Time_zone_id`,`Transition_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transitions'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Time zone transitions'
 SELECT * FROM time_zone_transition LIMIT 0;
 Time_zone_id	Transition_time	Transition_type_id
 DROP TABLE time_zone_transition;
@@ -245,46 +245,46 @@ time_zone_transition_type	CREATE TABLE `time_zone_transition_type` (
   `Is_DST` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `Abbreviation` char(8) NOT NULL DEFAULT '',
   PRIMARY KEY (`Time_zone_id`,`Transition_type_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transition types'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COMMENT='Time zone transition types'
 SELECT * FROM time_zone_transition_type LIMIT 0;
 Time_zone_id	Transition_type_id	Offset	Is_DST	Abbreviation
 DROP TABLE time_zone_transition_type;
 SHOW CREATE TABLE user;
 Table	Create Table
 user	CREATE TABLE `user` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `ssl_cipher` blob NOT NULL,
   `x509_issuer` blob NOT NULL,
   `x509_subject` blob NOT NULL,
@@ -292,11 +292,11 @@ user	CREATE TABLE `user` (
   `max_updates` int(11) unsigned NOT NULL DEFAULT 0,
   `max_connections` int(11) unsigned NOT NULL DEFAULT 0,
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT 0,
-  `plugin` char(64) COLLATE utf8_bin DEFAULT '',
-  `authentication_string` text COLLATE utf8_bin DEFAULT NULL,
-  `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `plugin` char(64) COLLATE utf8mb3_bin DEFAULT '',
+  `authentication_string` text COLLATE utf8mb3_bin DEFAULT NULL,
+  `password_expired` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Users and global privileges'
 SELECT * FROM user LIMIT 0;
 Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	Create_tablespace_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	authentication_string	password_expired
 DROP TABLE user;
diff --git a/mysql-test/main/mysql_locale_posix.result b/mysql-test/main/mysql_locale_posix.result
index 72a473bb89e..039e3ea442b 100644
--- a/mysql-test/main/mysql_locale_posix.result
+++ b/mysql-test/main/mysql_locale_posix.result
@@ -33,7 +33,7 @@ Database: ó
 
 utf8
 @@character_set_client
-utf8
+utf8mb3
 Database: ó
 +--------+
 | Tables |
diff --git a/mysql-test/main/mysql_not_windows.result b/mysql-test/main/mysql_not_windows.result
index 96210a366a6..644b3a0f4f0 100644
--- a/mysql-test/main/mysql_not_windows.result
+++ b/mysql-test/main/mysql_not_windows.result
@@ -9,5 +9,5 @@ End of tests
 2
 X
 3
-ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
+ERROR 1300 (HY000): Invalid utf8mb3 character string: 'test\xF0\x9F\x98\x81 '
 ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index 3a4ac9089a2..2f7d968a8bd 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -1496,38 +1496,38 @@ FLUSH PRIVILEGES;
 SHOW CREATE TABLE mysql.user;
 Table	Create Table
 user	CREATE TABLE `user` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `ssl_cipher` blob NOT NULL,
   `x509_issuer` blob NOT NULL,
   `x509_subject` blob NOT NULL,
@@ -1535,14 +1535,14 @@ user	CREATE TABLE `user` (
   `max_updates` int(11) unsigned NOT NULL DEFAULT 0,
   `max_connections` int(11) unsigned NOT NULL DEFAULT 0,
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT 0,
-  `plugin` char(64) COLLATE utf8_bin NOT NULL DEFAULT 'mysql_native_password',
-  `authentication_string` text COLLATE utf8_bin DEFAULT NULL,
-  `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `plugin` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT 'mysql_native_password',
+  `authentication_string` text COLLATE utf8mb3_bin DEFAULT NULL,
+  `password_expired` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   `password_last_changed` timestamp NULL DEFAULT NULL,
   `password_lifetime` smallint(5) unsigned DEFAULT NULL,
-  `account_locked` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `account_locked` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='Users and global privileges'
 Phase 1/7: Checking and upgrading mysql database
 Processing databases
 mysql
diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result
index 597be2e4cb6..a7f13c185a8 100644
--- a/mysql-test/main/mysql_upgrade_view.result
+++ b/mysql-test/main/mysql_upgrade_view.result
@@ -236,13 +236,13 @@ Phase 7/7: Running 'FLUSH PRIVILEGES'
 OK
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v2;
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v3;
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 set sql_log_bin=1;
 REPAIR VIEW v1,v2;
 Table	Op	Msg_type	Msg_text
@@ -303,13 +303,13 @@ flush tables;
 create algorithm=temptable view v4 as select a from t1;
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v2;
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v3;
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v4;
 View	Create View	character_set_client	collation_connection
 v4	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1`	latin1	latin1_swedish_ci
@@ -489,13 +489,13 @@ OK
 flush tables;
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v2;
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v2	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v3;
 View	Create View	character_set_client	collation_connection
-v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8	utf8_general_ci
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`a` AS `a` from `t1`	utf8mb3	utf8mb3_general_ci
 show create view v4;
 View	Create View	character_set_client	collation_connection
 v4	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1`	latin1	latin1_swedish_ci
diff --git a/mysql-test/main/mysqlcheck.result b/mysql-test/main/mysqlcheck.result
index 284574cf6da..59eba2ebbce 100644
--- a/mysql-test/main/mysqlcheck.result
+++ b/mysql-test/main/mysqlcheck.result
@@ -262,8 +262,8 @@ USE `a@b`;
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA="a@b" ORDER BY trigger_name;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-def	a@b	tr1	INSERT	def	a@b	c@d	1	NULL	SET NEW.a = 10 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
-def	a@b	tr2	INSERT	def	a@b	t1	1	NULL	SET NEW.a = 100 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
+def	a@b	tr1	INSERT	def	a@b	c@d	1	NULL	SET NEW.a = 10 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
+def	a@b	tr2	INSERT	def	a@b	t1	1	NULL	SET NEW.a = 100 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 INSERT INTO `c@d` VALUES (2), (1);
 SELECT * FROM `c@d`;
 a
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 5857d234525..6c063346809 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -676,7 +676,7 @@ The following specify which files/extra groups are read (specified before remain
  --old-mode=name     Used to emulate old behavior from earlier MariaDB or
  MySQL versions. Any combination of: 
  NO_DUP_KEY_WARNINGS_WITH_IGNORE, NO_PROGRESS_INFO, 
- ZERO_DATE_TIME_CAST
+ ZERO_DATE_TIME_CAST, UTF8_IS_UTF8MB3
  --old-passwords     Use old password encryption method (needed for 4.0 and
  older clients)
  --old-style-user-limits 
@@ -1647,7 +1647,7 @@ net-retry-count 10
 net-write-timeout 60
 old FALSE
 old-alter-table DEFAULT
-old-mode 
+old-mode UTF8_IS_UTF8MB3
 old-passwords FALSE
 old-style-user-limits FALSE
 optimizer-max-sel-arg-weight 32000
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index df790546d5b..b4bea9d3686 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -3726,7 +3726,7 @@ CREATE TEMPORARY TABLE `TABLES` (
   `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
   `MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
   `TEMPORARY` varchar(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 #
 # Bug#19745 mysqldump --xml produces invalid xml
@@ -4719,8 +4719,8 @@ ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `test` (
-  `c1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `c1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 ALTER DATABASE `test-database` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -4739,7 +4739,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+ALTER DATABASE `test-database` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
 DROP DATABASE `test-database`;
 USE test;
 #
@@ -5177,7 +5177,7 @@ RETURN CONCAT(']]>, ', c1, '!');
 <mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <database name="BUG52792">
 	<routines>
-		<routine Function="straße" sql_mode="" character_set_client="utf8" collation_connection="utf8_general_ci" Database_Collation="latin1_swedish_ci">
+		<routine Function="straße" sql_mode="" character_set_client="utf8mb3" collation_connection="utf8mb3_general_ci" Database_Collation="latin1_swedish_ci">
 <![CDATA[
 CREATE DEFINER=`root`@`localhost` FUNCTION `straße`(c1 CHAR(20)) RETURNS char(50) CHARSET latin1
     DETERMINISTIC
@@ -5284,7 +5284,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 SHOW CREATE TABLE mysql.slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -5301,7 +5301,7 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 SET @@global.log_output=       @old_log_output_state;
 SET @@global.slow_query_log=   @old_slow_query_log_state;
 SET @@global.general_log=      @old_general_log_state;
@@ -5383,11 +5383,11 @@ SHOW TRIGGERS FROM bug25717383;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 trig
 one	INSERT	tab
-one	SET NEW.a = 1	BEFORE	#		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
+one	SET NEW.a = 1	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SHOW EVENTS FROM bug25717383;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 bug25717383	event
-one	root@localhost	SYSTEM	ONE TIME	#	NULL	NULL	NULL	NULL	ENABLED	1	utf8	utf8_general_ci	latin1_swedish_ci
+one	root@localhost	SYSTEM	ONE TIME	#	NULL	NULL	NULL	NULL	ENABLED	1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SELECT ROUTINE_NAME FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA='bug25717383' AND ROUTINE_TYPE= 'PROCEDURE'
        ORDER BY ROUTINE_NAME;
@@ -5404,11 +5404,11 @@ SHOW TRIGGERS FROM bug25717383;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 trig
 one	INSERT	tab
-one	SET NEW.a = 1	BEFORE	#		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
+one	SET NEW.a = 1	BEFORE	#		root@localhost	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SHOW EVENTS FROM bug25717383;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 bug25717383	event
-one	root@localhost	SYSTEM	ONE TIME	#	NULL	NULL	NULL	NULL	ENABLED	1	utf8	utf8_general_ci	latin1_swedish_ci
+one	root@localhost	SYSTEM	ONE TIME	#	NULL	NULL	NULL	NULL	ENABLED	1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SELECT ROUTINE_NAME FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA='bug25717383' AND ROUTINE_TYPE= 'PROCEDURE'
        ORDER BY ROUTINE_NAME;
@@ -5432,9 +5432,9 @@ ALTER DATABASE `a\"'``b` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 DELIMITER ;;
@@ -5445,7 +5445,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-ALTER DATABASE `a\"'``b` CHARACTER SET utf8 COLLATE utf8_general_ci ;
+ALTER DATABASE `a\"'``b` CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci ;
 DROP DATABASE `a\"'``b`;
 use test;
 #
@@ -5477,21 +5477,21 @@ CREATE VIEW nonunique_table_view_name AS SELECT 1;
 ##################################################
 # --compact --databases db1 db2
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
 
 USE `db1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `basetable` (
   `id` smallint(6) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `basetable` VALUES (5),(6);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_name` (
   `i3` smallint(6) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`basetable`);
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 INSERT_METHOD=LAST UNION=(`basetable`);
 /*!40101 SET character_set_client = @saved_cs_client */;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
@@ -5500,7 +5500,7 @@ SET character_set_client = utf8;
 ) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
 
 USE `db2`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
@@ -5508,14 +5508,14 @@ USE `db2`;
 CREATE TABLE `nonunique_table_name` (
   `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   UNIQUE KEY `i1` (`i1`)
-) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_name` VALUES (1),(2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_view_name` VALUES (3),(4);
 
@@ -5524,9 +5524,9 @@ USE `db1`;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 SET character_set_client      = utf8mb3 */;
+/*!50001 SET character_set_results     = utf8mb3 */;
+/*!50001 SET collation_connection      = utf8mb3_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
 /*!50001 VIEW `nonunique_table_view_name` AS select 1 AS `1` */;
@@ -5544,21 +5544,21 @@ USE `db2`;
 CREATE TABLE `nonunique_table_name` (
   `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   UNIQUE KEY `i1` (`i1`)
-) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_name` VALUES (1),(2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_view_name` VALUES (3),(4);
 
 ##################################################
 # --compact --delayed-insert --no-data-med=0 --databases db2 db1
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
 
 USE `db2`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
@@ -5566,32 +5566,32 @@ USE `db2`;
 CREATE TABLE `nonunique_table_name` (
   `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   UNIQUE KEY `i1` (`i1`)
-) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT  DELAYED INTO `nonunique_table_name` VALUES (1),(2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_view_name` VALUES (3),(4);
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
 
 USE `db1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `basetable` (
   `id` smallint(6) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT  DELAYED INTO `basetable` VALUES (5),(6);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_name` (
   `i3` smallint(6) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`basetable`);
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 INSERT_METHOD=LAST UNION=(`basetable`);
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `nonunique_table_name` VALUES (5),(6);
 SET @saved_cs_client     = @@character_set_client;
@@ -5608,9 +5608,9 @@ USE `db1`;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 SET character_set_client      = utf8mb3 */;
+/*!50001 SET character_set_results     = utf8mb3 */;
+/*!50001 SET collation_connection      = utf8mb3_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
 /*!50001 VIEW `nonunique_table_view_name` AS select 1 AS `1` */;
@@ -5697,9 +5697,9 @@ USE `test`;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 /*!50032 DROP TRIGGER IF EXISTS tt1_t1 */;
@@ -5743,29 +5743,29 @@ DROP TABLE IF EXISTS `innodb_index_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_index_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `stat_value` bigint(20) unsigned NOT NULL,
   `sample_size` bigint(20) unsigned DEFAULT NULL,
-  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  `stat_description` varchar(1024) COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `innodb_table_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_table_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `n_rows` bigint(20) unsigned NOT NULL,
   `clustered_index_size` bigint(20) unsigned NOT NULL,
   `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5776,7 +5776,7 @@ CREATE TABLE IF NOT EXISTS `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5794,7 +5794,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5803,12 +5803,12 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
   `commit_id` bigint(20) unsigned NOT NULL,
   `begin_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
   `commit_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
-  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8_bin NOT NULL,
+  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`transaction_id`),
   UNIQUE KEY `commit_id` (`commit_id`),
   KEY `begin_timestamp` (`begin_timestamp`),
   KEY `commit_timestamp` (`commit_timestamp`,`transaction_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -5838,16 +5838,16 @@ DROP TABLE IF EXISTS `innodb_index_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_index_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `stat_value` bigint(20) unsigned NOT NULL,
   `sample_size` bigint(20) unsigned DEFAULT NULL,
-  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  `stat_description` varchar(1024) COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `innodb_index_stats` WRITE;
@@ -5858,14 +5858,14 @@ DROP TABLE IF EXISTS `innodb_table_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_table_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `n_rows` bigint(20) unsigned NOT NULL,
   `clustered_index_size` bigint(20) unsigned NOT NULL,
   `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `innodb_table_stats` WRITE;
@@ -5881,7 +5881,7 @@ CREATE TABLE IF NOT EXISTS `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5899,7 +5899,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5908,12 +5908,12 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
   `commit_id` bigint(20) unsigned NOT NULL,
   `begin_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
   `commit_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
-  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8_bin NOT NULL,
+  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`transaction_id`),
   UNIQUE KEY `commit_id` (`commit_id`),
   KEY `begin_timestamp` (`begin_timestamp`),
   KEY `commit_timestamp` (`commit_timestamp`,`transaction_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -5943,16 +5943,16 @@ DROP TABLE IF EXISTS `innodb_index_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_index_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `stat_value` bigint(20) unsigned NOT NULL,
   `sample_size` bigint(20) unsigned DEFAULT NULL,
-  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  `stat_description` varchar(1024) COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `innodb_index_stats` WRITE;
@@ -5963,14 +5963,14 @@ DROP TABLE IF EXISTS `innodb_table_stats`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `innodb_table_stats` (
-  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `database_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8mb3_bin NOT NULL,
   `last_update` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `n_rows` bigint(20) unsigned NOT NULL,
   `clustered_index_size` bigint(20) unsigned NOT NULL,
   `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`database_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `innodb_table_stats` WRITE;
@@ -5986,7 +5986,7 @@ CREATE TABLE IF NOT EXISTS `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -6004,7 +6004,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -6013,12 +6013,12 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
   `commit_id` bigint(20) unsigned NOT NULL,
   `begin_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
   `commit_timestamp` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
-  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8_bin NOT NULL,
+  `isolation_level` enum('READ-UNCOMMITTED','READ-COMMITTED','REPEATABLE-READ','SERIALIZABLE') COLLATE utf8mb3_bin NOT NULL,
   PRIMARY KEY (`transaction_id`),
   UNIQUE KEY `commit_id` (`commit_id`),
   KEY `begin_timestamp` (`begin_timestamp`),
   KEY `commit_timestamp` (`commit_timestamp`,`transaction_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
index 799f24665ee..d2264d0a585 100644
--- a/mysql-test/main/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
@@ -10,7 +10,7 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
 --source include/have_log_bin.inc
 
 # utf8 is required
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 # Save the initial number of concurrent sessions
diff --git a/mysql-test/main/mysqltest_tracking_info.result b/mysql-test/main/mysqltest_tracking_info.result
index 2a58ba430ca..61bb3f2d1e2 100644
--- a/mysql-test/main/mysqltest_tracking_info.result
+++ b/mysql-test/main/mysqltest_tracking_info.result
@@ -7,7 +7,7 @@ SET @@session.session_track_system_variables='character_set_connection';
 SET NAMES 'utf8';
 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
 -- character_set_connection
--- utf8
+-- utf8mb3
 
 SET NAMES 'big5';
 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
@@ -18,14 +18,14 @@ SET NAMES 'big5';
 SET NAMES 'utf8';
 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
 -- character_set_connection
--- utf8
+-- utf8mb3
 
 SET NAMES 'big5';
 # tracking info on
 SET NAMES 'utf8';
 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
 -- character_set_connection
--- utf8
+-- utf8mb3
 
 # tracking info off once
 SET NAMES 'big5';
diff --git a/mysql-test/main/null.result b/mysql-test/main/null.result
index 73ac958cacd..16a51d2d931 100644
--- a/mysql-test/main/null.result
+++ b/mysql-test/main/null.result
@@ -1660,7 +1660,7 @@ EXPLAIN EXTENDED SELECT NULLIF(a,_utf8'a' COLLATE utf8_bin) IS NULL AS expr FROM
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
 Warnings:
-Note	1003	select (case when convert(`test`.`t1`.`a` using utf8) = _utf8'a' collate utf8_bin then NULL else `test`.`t1`.`a` end) is null AS `expr` from `test`.`t1`
+Note	1003	select (case when convert(`test`.`t1`.`a` using utf8mb3) = _utf8mb3'a' collate utf8mb3_bin then NULL else `test`.`t1`.`a` end) is null AS `expr` from `test`.`t1`
 DROP TABLE t1;
 #
 # MDEV-8740 Wrong result for SELECT..WHERE year_field=10 AND NULLIF(year_field,2011.1)='2011'
diff --git a/mysql-test/main/partition_innodb_plugin.result b/mysql-test/main/partition_innodb_plugin.result
index 39963e8c911..2cc2323703b 100644
--- a/mysql-test/main/partition_innodb_plugin.result
+++ b/mysql-test/main/partition_innodb_plugin.result
@@ -29,7 +29,7 @@ t1	CREATE TABLE `t1` (
   `time` date NOT NULL,
   `id2` bigint(20) NOT NULL,
   PRIMARY KEY (`id`,`time`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3
  PARTITION BY RANGE (to_days(`time`))
 (PARTITION `p10` VALUES LESS THAN (734708) ENGINE = InnoDB,
  PARTITION `p20` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
diff --git a/mysql-test/main/partition_utf8-debug.result b/mysql-test/main/partition_utf8-debug.result
index 569bec3ea8a..db1396198ab 100644
--- a/mysql-test/main/partition_utf8-debug.result
+++ b/mysql-test/main/partition_utf8-debug.result
@@ -41,7 +41,7 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8
 PARTITION BY LIST COLUMNS (a) (PARTITION p0 VALUES IN (_utf8'ß'));
 Warnings:
 Note	1003	 PARTITION BY LIST  COLUMNS(`a`)
-(PARTITION `p0` VALUES IN (_utf8 0xc39f) ENGINE = MyISAM)
+(PARTITION `p0` VALUES IN (_utf8mb3 0xc39f) ENGINE = MyISAM)
 SELECT PARTITION_DESCRIPTION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1';
 PARTITION_DESCRIPTION
 'ß'
@@ -50,7 +50,7 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8
 PARTITION BY LIST COLUMNS (a) (PARTITION p0 VALUES IN ('ß'));
 Warnings:
 Note	1003	 PARTITION BY LIST  COLUMNS(`a`)
-(PARTITION `p0` VALUES IN (_utf8 0xc39f) ENGINE = MyISAM)
+(PARTITION `p0` VALUES IN (_utf8mb3 0xc39f) ENGINE = MyISAM)
 SELECT PARTITION_DESCRIPTION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1';
 PARTITION_DESCRIPTION
 'ß'
@@ -77,7 +77,7 @@ CREATE OR REPLACE TABLE t1 (a DATE) CHARACTER SET utf8
 PARTITION BY LIST COLUMNS (a) (PARTITION p0 VALUES IN (FROM_DAYS(100)));
 Warnings:
 Note	1003	 PARTITION BY LIST  COLUMNS(`a`)
-(PARTITION `p0` VALUES IN (_utf8 0x303030302d30302d3030) ENGINE = MyISAM)
+(PARTITION `p0` VALUES IN (_utf8mb3 0x303030302d30302d3030) ENGINE = MyISAM)
 SELECT PARTITION_DESCRIPTION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1';
 PARTITION_DESCRIPTION
 '0000-00-00'
diff --git a/mysql-test/main/partition_utf8.result b/mysql-test/main/partition_utf8.result
index 185d081b1c9..d279cdfab43 100644
--- a/mysql-test/main/partition_utf8.result
+++ b/mysql-test/main/partition_utf8.result
@@ -79,7 +79,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varbinary(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
  PARTITION BY LIST  COLUMNS(`a`)
 (PARTITION `p0` VALUES IN (_binary 0xff) ENGINE = MyISAM)
 SELECT PARTITION_DESCRIPTION FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME='t1';
diff --git a/mysql-test/main/plugin.result b/mysql-test/main/plugin.result
index 50986b95ccc..f7571740f31 100644
--- a/mysql-test/main/plugin.result
+++ b/mysql-test/main/plugin.result
@@ -323,7 +323,7 @@ select convert('admin𝌆' using utf8);
 convert('admin𝌆' using utf8)
 admin????
 Warnings:
-Warning	1300	Invalid utf8 character string: '\xF0\x9D\x8C\x86'
+Warning	1300	Invalid utf8mb3 character string: '\xF0\x9D\x8C\x86'
 install plugin foo soname 'admin𝌆';
 ERROR HY000: No paths allowed for shared library
 # End of 5.5 test
diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result
index 5c8f55e38ec..3d86d713009 100644
--- a/mysql-test/main/plugin_auth.result
+++ b/mysql-test/main/plugin_auth.result
@@ -23,16 +23,16 @@ test mysql.proxies_priv;
 SHOW CREATE TABLE mysql.proxies_priv;
 Table	Create Table
 proxies_priv	CREATE TABLE `proxies_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proxied_host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proxied_user` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proxied_host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proxied_user` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `With_grant` tinyint(1) NOT NULL DEFAULT 0,
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User proxy privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User proxy privileges'
 connect plug_con,localhost,plug,plug_dest;
 select USER(),CURRENT_USER();
 USER()	CURRENT_USER()
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index 6b2586e9be6..fd9fd7fff1c 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -1109,12 +1109,12 @@ show create table mysqltest.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 show create table mysqltest.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `test` varchar(4) CHARACTER SET latin1 NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
 drop table mysqltest.t1;
 drop table mysqltest.t2;
 alter database mysqltest character set latin1;
@@ -1728,7 +1728,7 @@ set @@character_set_server= utf8;
 execute stmt;
 show create database mysqltest_1;
 Database	Create Database
-mysqltest_1	CREATE DATABASE `mysqltest_1` /*!40100 DEFAULT CHARACTER SET utf8 */
+mysqltest_1	CREATE DATABASE `mysqltest_1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 drop database mysqltest_1;
 deallocate prepare stmt;
 set @@character_set_server= @old_character_set_server;
@@ -2979,7 +2979,7 @@ execute stmt;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(100) CHARACTER SET utf8 DEFAULT NULL,
+  `c` char(100) CHARACTER SET utf8mb3 DEFAULT NULL,
   KEY `c` (`c`(10))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -2987,7 +2987,7 @@ execute stmt;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(100) CHARACTER SET utf8 DEFAULT NULL,
+  `c` char(100) CHARACTER SET utf8mb3 DEFAULT NULL,
   KEY `c` (`c`(10))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -5273,7 +5273,7 @@ CREATE TABLE t1 AS SELECT @a AS c1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
diff --git a/mysql-test/main/query_cache_ps_no_prot.result b/mysql-test/main/query_cache_ps_no_prot.result
index ef1f92b597d..94986da49f0 100644
--- a/mysql-test/main/query_cache_ps_no_prot.result
+++ b/mysql-test/main/query_cache_ps_no_prot.result
@@ -408,9 +408,9 @@ EXECUTE stmt_a_2;
 SELECT * FROM mysqltest1.t1;
 msg
 mysqltest1
-utf8_unicode_ci
+utf8mb3_unicode_ci
 mysqltest1
-utf8_unicode_ci
+utf8mb3_unicode_ci
 
 SELECT * FROM mysqltest2.t1;
 msg
@@ -484,7 +484,7 @@ NULL	latin1_swedish_ci
 
 EXECUTE stmt_c_1;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
@@ -516,7 +516,7 @@ Note	1049	Unknown database 'mysqltest2'
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 EXECUTE stmt_c_3;
 DATABASE()	@@collation_database
@@ -524,7 +524,7 @@ NULL	latin1_swedish_ci
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 DROP DATABASE mysqltest1;
 
diff --git a/mysql-test/main/query_cache_ps_no_prot.test b/mysql-test/main/query_cache_ps_no_prot.test
index 61388b0f97a..d5d77927f8f 100644
--- a/mysql-test/main/query_cache_ps_no_prot.test
+++ b/mysql-test/main/query_cache_ps_no_prot.test
@@ -14,7 +14,7 @@
 --source include/have_query_cache.inc
 --source include/default_charset.inc
 
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 # The file with expected results fits only to a run without
diff --git a/mysql-test/main/query_cache_ps_ps_prot.result b/mysql-test/main/query_cache_ps_ps_prot.result
index e3f2da1dbbe..16cad15450e 100644
--- a/mysql-test/main/query_cache_ps_ps_prot.result
+++ b/mysql-test/main/query_cache_ps_ps_prot.result
@@ -408,9 +408,9 @@ EXECUTE stmt_a_2;
 SELECT * FROM mysqltest1.t1;
 msg
 mysqltest1
-utf8_unicode_ci
+utf8mb3_unicode_ci
 mysqltest1
-utf8_unicode_ci
+utf8mb3_unicode_ci
 
 SELECT * FROM mysqltest2.t1;
 msg
@@ -484,7 +484,7 @@ NULL	latin1_swedish_ci
 
 EXECUTE stmt_c_1;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
@@ -516,7 +516,7 @@ Note	1049	Unknown database 'mysqltest2'
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 EXECUTE stmt_c_3;
 DATABASE()	@@collation_database
@@ -524,7 +524,7 @@ NULL	latin1_swedish_ci
 
 SELECT DATABASE(), @@collation_database;
 DATABASE()	@@collation_database
-mysqltest1	utf8_unicode_ci
+mysqltest1	utf8mb3_unicode_ci
 
 DROP DATABASE mysqltest1;
 
diff --git a/mysql-test/main/query_cache_ps_ps_prot.test b/mysql-test/main/query_cache_ps_ps_prot.test
index d431ce349d2..5f6d43f36e9 100644
--- a/mysql-test/main/query_cache_ps_ps_prot.test
+++ b/mysql-test/main/query_cache_ps_ps_prot.test
@@ -12,7 +12,7 @@
 # We cannot run on embedded server because we use multiple sessions.
 --source include/not_embedded.inc
 --source include/have_query_cache.inc
-let collation=utf8_unicode_ci;
+let collation=utf8mb3_unicode_ci;
 --source include/have_collation.inc
 
 # The file with expected results fits only to a run with "--ps-protocol".
diff --git a/mysql-test/main/reset_connection.result b/mysql-test/main/reset_connection.result
index 54f6ffdbd25..f2525760528 100644
--- a/mysql-test/main/reset_connection.result
+++ b/mysql-test/main/reset_connection.result
@@ -8,10 +8,10 @@ Com_select	0
 # Test if charset changes after reset (utf8)
 connect utf8_conn,localhost,root,,,,,CHARSET=utf8;
 connection utf8_conn;
-SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+SELECT IF(@@character_set_client='utf8mb3','OK', 'FAIL') AS RESULT;
 RESULT
 OK
-SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+SELECT IF(@@character_set_client='utf8mb3','OK', 'FAIL') AS RESULT;
 RESULT
 OK
 disconnect utf8_conn;
diff --git a/mysql-test/main/reset_connection.test b/mysql-test/main/reset_connection.test
index 73c8280703c..29a8ff52f89 100644
--- a/mysql-test/main/reset_connection.test
+++ b/mysql-test/main/reset_connection.test
@@ -26,9 +26,9 @@ SHOW local STATUS LIKE 'com_select';
 --echo # Test if charset changes after reset (utf8)
 connect(utf8_conn,localhost,root,,,,,CHARSET=utf8);
 connection utf8_conn;
-SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+SELECT IF(@@character_set_client='utf8mb3','OK', 'FAIL') AS RESULT;
 --reset_connection
-SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+SELECT IF(@@character_set_client='utf8mb3','OK', 'FAIL') AS RESULT;
 disconnect utf8_conn;
 
 --echo # Test if charset changes after reset (latin1)
diff --git a/mysql-test/main/show_check.result b/mysql-test/main/show_check.result
index 92f55045dc4..f07c19261d0 100644
--- a/mysql-test/main/show_check.result
+++ b/mysql-test/main/show_check.result
@@ -875,14 +875,14 @@ set names utf8;
 -- resultset is non-binary for string type. This should be changed
 -- after Bug#29394 is implemented.
 ----------------------------------------------------------------
-SHOW CHARACTER SET LIKE 'utf8';
+SHOW CHARACTER SET LIKE 'utf8mb3';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	96	4	N	1	0	33
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	96	7	N	1	0	33
 def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DESCRIPTION	Description	253	180	13	N	1	0	33
-def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	96	15	N	1	0	33
+def	information_schema	CHARACTER_SETS	CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	96	18	N	1	0	33
 def	information_schema	CHARACTER_SETS	CHARACTER_SETS	MAXLEN	Maxlen	8	3	1	N	32769	0	63
 Charset	Description	Default collation	Maxlen
-utf8	UTF-8 Unicode	utf8_general_ci	3
+utf8mb3	UTF-8 Unicode	utf8mb3_general_ci	3
 ----------------------------------------------------------------
 SHOW COLLATION LIKE 'latin1_bin';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
@@ -1266,7 +1266,7 @@ PRIMARY KEY  (Codigo)
 show create table t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					Table	253	192	2	N	1	39	33
-def					Create Table	253	3072	458	N	1	39	33
+def					Create Table	253	3072	461	N	1	39	33
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `Codigo` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1279,7 +1279,7 @@ t1	CREATE TABLE `t1` (
   `Provincia` varchar(255) DEFAULT NULL,
   `Poblacion` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`Codigo`)
-) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=utf8
+) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb3
 drop table t1;
 End of 5.0 tests
 SHOW AUTHORS;
@@ -1532,7 +1532,7 @@ LOCK TABLE t1 WRITE;
 connection default;
 SHOW CREATE TRIGGER t1_bi;
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-t1_bi	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a = 1	utf8	utf8_general_ci	latin1_swedish_ci	#
+t1_bi	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a = 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci	#
 connection con1;
 UNLOCK TABLES;
 # Test 2: ALTER TABLE with SHOW CREATE TRIGGER in transaction
@@ -1540,7 +1540,7 @@ connection default;
 START TRANSACTION;
 SHOW CREATE TRIGGER t1_bi;
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-t1_bi	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a = 1	utf8	utf8_general_ci	latin1_swedish_ci	#
+t1_bi	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a = 1	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci	#
 connection con1;
 ALTER TABLE t1 CHARACTER SET = utf8;
 disconnect con1;
diff --git a/mysql-test/main/show_check.test b/mysql-test/main/show_check.test
index 38bcb5f14e7..15beaaf0401 100644
--- a/mysql-test/main/show_check.test
+++ b/mysql-test/main/show_check.test
@@ -719,7 +719,7 @@ set names utf8;
 --echo ----------------------------------------------------------------
 
 --disable_ps_protocol
-SHOW CHARACTER SET LIKE 'utf8';
+SHOW CHARACTER SET LIKE 'utf8mb3';
 --enable_ps_protocol
 
 --echo ----------------------------------------------------------------
diff --git a/mysql-test/main/sp-anchor-type.result b/mysql-test/main/sp-anchor-type.result
index f7674735821..9d339b8235c 100644
--- a/mysql-test/main/sp-anchor-type.result
+++ b/mysql-test/main/sp-anchor-type.result
@@ -464,7 +464,7 @@ t2	CREATE TABLE `t2` (
   `dc209` decimal(20,9) DEFAULT NULL,
   `cc` char(10) DEFAULT NULL,
   `cv` varchar(10) DEFAULT NULL,
-  `cvu` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
+  `cvu` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
   `t1` tinytext DEFAULT NULL,
   `t2` text DEFAULT NULL,
   `t3` mediumtext DEFAULT NULL,
@@ -626,7 +626,7 @@ t2	CREATE TABLE `t2` (
   `dc209` decimal(20,9) DEFAULT NULL,
   `cc` char(10) DEFAULT NULL,
   `cv` varchar(10) DEFAULT NULL,
-  `cvu` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
+  `cvu` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
   `t1` tinytext DEFAULT NULL,
   `t2` text DEFAULT NULL,
   `t3` mediumtext DEFAULT NULL,
@@ -824,9 +824,9 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `tables_table_name` varchar(64) CHARACTER SET utf8 DEFAULT NULL,
+  `tables_table_name` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL,
   `tables_table_rows` bigint(21) unsigned DEFAULT NULL,
-  `processlist_info` longtext CHARACTER SET utf8 DEFAULT NULL,
+  `processlist_info` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
   `processlist_info_binary` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
diff --git a/mysql-test/main/sp-row.result b/mysql-test/main/sp-row.result
index 7c257297934..3751b70b260 100644
--- a/mysql-test/main/sp-row.result
+++ b/mysql-test/main/sp-row.result
@@ -743,9 +743,9 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `rec1.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec2.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec3.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `rec1.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec2.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec3.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1835,8 +1835,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` char(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` char(10) CHARACTER SET utf8 DEFAULT NULL
+  `var` char(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1875,8 +1875,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `var` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1885,8 +1885,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `rec.var` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `var` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `rec.var` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2084,8 +2084,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` text CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` text CHARACTER SET utf8 DEFAULT NULL
+  `var` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` text CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2094,8 +2094,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` tinytext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` tinytext CHARACTER SET utf8 DEFAULT NULL
+  `var` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` tinytext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2104,8 +2104,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `var` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2114,8 +2114,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` longtext CHARACTER SET utf8 DEFAULT NULL
+  `var` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
diff --git a/mysql-test/main/sp-ucs2.result b/mysql-test/main/sp-ucs2.result
index 047a64713af..c1ca89c9150 100644
--- a/mysql-test/main/sp-ucs2.result
+++ b/mysql-test/main/sp-ucs2.result
@@ -121,7 +121,7 @@ RETURN 0;
 SHOW CREATE FUNCTION bug48766;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug48766	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `bug48766`() RETURNS enum('w') CHARSET ucs2
-RETURN 0	utf8	utf8_general_ci	latin1_swedish_ci
+RETURN 0	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SELECT DTD_IDENTIFIER FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_NAME='bug48766';
 DTD_IDENTIFIER
@@ -133,7 +133,7 @@ RETURN 0;
 SHOW CREATE FUNCTION bug48766;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug48766	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `bug48766`() RETURNS enum('а','б','в','г') CHARSET ucs2
-RETURN 0	utf8	utf8_general_ci	latin1_swedish_ci
+RETURN 0	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 SELECT DTD_IDENTIFIER FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_NAME='bug48766';
 DTD_IDENTIFIER
diff --git a/mysql-test/main/sp-vars.result b/mysql-test/main/sp-vars.result
index 4952746c4e0..a755f8e739f 100644
--- a/mysql-test/main/sp-vars.result
+++ b/mysql-test/main/sp-vars.result
@@ -987,10 +987,10 @@ CHARSET(arg)
 latin1
 CALL p2('t');
 CHARSET(arg)
-utf8
+utf8mb3
 CALL p2(_LATIN1 't');
 CHARSET(arg)
-utf8
+utf8mb3
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
 
@@ -1252,7 +1252,7 @@ $$
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "var" tinytext CHARACTER SET utf8 DEFAULT NULL
+  "var" tinytext CHARACTER SET utf8mb3 DEFAULT NULL
 )
 DROP TABLE t1;
 BEGIN NOT ATOMIC
@@ -1263,7 +1263,7 @@ $$
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "var" text CHARACTER SET utf8 DEFAULT NULL
+  "var" text CHARACTER SET utf8mb3 DEFAULT NULL
 )
 DROP TABLE t1;
 BEGIN NOT ATOMIC
@@ -1274,7 +1274,7 @@ $$
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "var" mediumtext CHARACTER SET utf8 DEFAULT NULL
+  "var" mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 )
 DROP TABLE t1;
 BEGIN NOT ATOMIC
@@ -1285,7 +1285,7 @@ $$
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "var" longtext CHARACTER SET utf8 DEFAULT NULL
+  "var" longtext CHARACTER SET utf8mb3 DEFAULT NULL
 )
 DROP TABLE t1;
 BEGIN NOT ATOMIC
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index f5ba0555cc2..3ae74a70687 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -3355,15 +3355,15 @@ begin
 l�bel: begin end;
 label: begin end;
 label1: begin end;
-end	utf8	latin1_swedish_ci	latin1_swedish_ci
+end	utf8mb3	latin1_swedish_ci	latin1_swedish_ci
 show create procedure bug7088_1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 bug7088_1		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_1`()
-label1: begin end label1	utf8	latin1_swedish_ci	latin1_swedish_ci
+label1: begin end label1	utf8mb3	latin1_swedish_ci	latin1_swedish_ci
 show create procedure bug7088_2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 bug7088_2		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_2`()
-l�bel1: begin end	utf8	latin1_swedish_ci	latin1_swedish_ci
+l�bel1: begin end	utf8mb3	latin1_swedish_ci	latin1_swedish_ci
 drop procedure bug6063|
 drop procedure bug7088_1|
 drop procedure bug7088_2|
@@ -4918,7 +4918,7 @@ Database	Create Database
 mysqltest1	CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */
 show create database mysqltest2|
 Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */
+mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 alter database mysqltest1 character set utf8|
 use mysqltest2|
 call mysqltest1.p1()|
@@ -4927,7 +4927,7 @@ Database	Create Database
 mysqltest1	CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */
 show create database mysqltest2|
 Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */
+mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8mb3 */
 drop database mysqltest1|
 drop database mysqltest2|
 use test|
@@ -4979,20 +4979,20 @@ CREATE FUNCTION mysqltest2.bug16211_f4() RETURNS CHAR(10) CHARSET koi8r
 RETURN ""|
 SHOW CREATE FUNCTION bug16211_f1|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-bug16211_f1		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f1`() RETURNS char(10) CHARSET utf8
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+bug16211_f1		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f1`() RETURNS char(10) CHARSET utf8mb3
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION bug16211_f2|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug16211_f2		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f2`() RETURNS char(10) CHARSET koi8r
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION mysqltest2.bug16211_f3|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-bug16211_f3		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f3`() RETURNS char(10) CHARSET utf8
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+bug16211_f3		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f3`() RETURNS char(10) CHARSET utf8mb3
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION mysqltest2.bug16211_f4|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug16211_f4		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f4`() RETURNS char(10) CHARSET koi8r
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SELECT dtd_identifier
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f1"|
@@ -5015,13 +5015,13 @@ dtd_identifier
 char(10)
 SELECT CHARSET(bug16211_f1())|
 CHARSET(bug16211_f1())
-utf8
+utf8mb3
 SELECT CHARSET(bug16211_f2())|
 CHARSET(bug16211_f2())
 koi8r
 SELECT CHARSET(mysqltest2.bug16211_f3())|
 CHARSET(mysqltest2.bug16211_f3())
-utf8
+utf8mb3
 SELECT CHARSET(mysqltest2.bug16211_f4())|
 CHARSET(mysqltest2.bug16211_f4())
 koi8r
@@ -5029,20 +5029,20 @@ ALTER DATABASE mysqltest1 CHARACTER SET cp1251|
 ALTER DATABASE mysqltest2 CHARACTER SET cp1251|
 SHOW CREATE FUNCTION bug16211_f1|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-bug16211_f1		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f1`() RETURNS char(10) CHARSET utf8
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+bug16211_f1		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f1`() RETURNS char(10) CHARSET utf8mb3
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION bug16211_f2|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug16211_f2		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f2`() RETURNS char(10) CHARSET koi8r
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION mysqltest2.bug16211_f3|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-bug16211_f3		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f3`() RETURNS char(10) CHARSET utf8
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+bug16211_f3		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f3`() RETURNS char(10) CHARSET utf8mb3
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SHOW CREATE FUNCTION mysqltest2.bug16211_f4|
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 bug16211_f4		CREATE DEFINER=`root`@`localhost` FUNCTION `bug16211_f4`() RETURNS char(10) CHARSET koi8r
-RETURN ""	latin1	latin1_swedish_ci	utf8_general_ci
+RETURN ""	latin1	latin1_swedish_ci	utf8mb3_general_ci
 SELECT dtd_identifier
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = "mysqltest1" AND ROUTINE_NAME = "bug16211_f1"|
@@ -5065,13 +5065,13 @@ dtd_identifier
 char(10)
 SELECT CHARSET(bug16211_f1())|
 CHARSET(bug16211_f1())
-utf8
+utf8mb3
 SELECT CHARSET(bug16211_f2())|
 CHARSET(bug16211_f2())
 koi8r
 SELECT CHARSET(mysqltest2.bug16211_f3())|
 CHARSET(mysqltest2.bug16211_f3())
-utf8
+utf8mb3
 SELECT CHARSET(mysqltest2.bug16211_f4())|
 CHARSET(mysqltest2.bug16211_f4())
 koi8r
@@ -5103,11 +5103,11 @@ SET @v2 = 'b'|
 SET @v3 = 'c'|
 CALL bug16676_p1('a', @v2, @v3)|
 CHARSET(p1)	COLLATION(p1)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 CHARSET(p2)	COLLATION(p2)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 CHARSET(p3)	COLLATION(p3)
-utf8	utf8_general_ci
+utf8mb3	utf8mb3_general_ci
 CALL bug16676_p2('a', @v2, @v3)|
 CHARSET(p1)	COLLATION(p1)
 koi8r	koi8r_general_ci
@@ -6102,7 +6102,7 @@ create procedure proc_21513()`my_label`:BEGIN END|
 show create procedure proc_21513|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 proc_21513		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_21513`()
-`my_label`:BEGIN END	utf8	utf8_general_ci	latin1_swedish_ci
+`my_label`:BEGIN END	utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 drop procedure proc_21513|
 End of 5.0 tests.
 drop table t1,t2;
@@ -6137,7 +6137,7 @@ CREATE FUNCTION metered(a INT) RETURNS INT RETURN 12;
 CREATE VIEW v1 AS SELECT test.metered(a) as metered FROM t1;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`metered`(`t1`.`a`) AS `metered` from `t1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`metered`(`t1`.`a`) AS `metered` from `t1`	utf8mb3	utf8mb3_general_ci
 DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
@@ -8771,9 +8771,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` text CHARACTER SET utf8 DEFAULT NULL,
-  `c3` varchar(255) CHARACTER SET utf8 DEFAULT NULL
+  `c1` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` varchar(255) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -8782,9 +8782,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET utf8 DEFAULT NULL,
-  `c2` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -8793,9 +8793,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
@@ -8804,9 +8804,9 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c2` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c3` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c1` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c2` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c3` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP FUNCTION f1;
diff --git a/mysql-test/main/sp2.result b/mysql-test/main/sp2.result
index 853b45070fd..807cc801918 100644
--- a/mysql-test/main/sp2.result
+++ b/mysql-test/main/sp2.result
@@ -2,9 +2,9 @@ CREATE DATABASE test1;
 CREATE PROCEDURE test1.sp3() BEGIN END;
 SHOW PROCEDURE STATUS WHERE Db <> 'sys';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-mtr	add_suppression	PROCEDURE	root@localhost	#	#	DEFINER		utf8	utf8_general_ci	latin1_swedish_ci
-mtr	check_testcase	PROCEDURE	root@localhost	#	#	DEFINER		utf8	utf8_general_ci	latin1_swedish_ci
-mtr	check_warnings	PROCEDURE	root@localhost	#	#	DEFINER		utf8	utf8_general_ci	latin1_swedish_ci
+mtr	add_suppression	PROCEDURE	root@localhost	#	#	DEFINER		utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
+mtr	check_testcase	PROCEDURE	root@localhost	#	#	DEFINER		utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
+mtr	check_warnings	PROCEDURE	root@localhost	#	#	DEFINER		utf8mb3	utf8mb3_general_ci	latin1_swedish_ci
 mysql	AddGeometryColumn	PROCEDURE	mariadb.sys@localhost	#	#	INVOKER		latin1	latin1_swedish_ci	latin1_swedish_ci
 mysql	DropGeometryColumn	PROCEDURE	mariadb.sys@localhost	#	#	INVOKER		latin1	latin1_swedish_ci	latin1_swedish_ci
 test	sp2	PROCEDURE	root@localhost	#	#	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result
index 3bfb755120b..7daa0e5be87 100644
--- a/mysql-test/main/subselect4.result
+++ b/mysql-test/main/subselect4.result
@@ -2578,7 +2578,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	4	100.00	
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`l1` AS `l1`,`test`.`t1`.`i2` AS `i2` from `test`.`t1` where <nop>(<in_optimizer>(`test`.`t1`.`l1`,<max>(/* select#2 */ select max(`test`.`t2`.`v1`) from `test`.`t2`) > convert(<cache>(`test`.`t1`.`l1`) using utf8)))
+Note	1003	/* select#1 */ select `test`.`t1`.`l1` AS `l1`,`test`.`t1`.`i2` AS `i2` from `test`.`t1` where <nop>(<in_optimizer>(`test`.`t1`.`l1`,<max>(/* select#2 */ select max(`test`.`t2`.`v1`) from `test`.`t2`) > convert(<cache>(`test`.`t1`.`l1`) using utf8mb3)))
 SELECT * FROM t1 where  ( t1.l1 < ANY (SELECT MAX(t2.v1) FROM t2));
 l1	i2
 e	2
diff --git a/mysql-test/main/system_mysql_db.result b/mysql-test/main/system_mysql_db.result
index e04a4101ff3..d0d1e7c1175 100644
--- a/mysql-test/main/system_mysql_db.result
+++ b/mysql-test/main/system_mysql_db.result
@@ -34,92 +34,92 @@ user
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
 show create table user;
 View	Create View	character_set_client	collation_connection
 user	CREATE ALGORITHM=UNDEFINED DEFINER=`mariadb.sys`@`localhost` SQL SECURITY DEFINER VIEW `user` AS select `global_priv`.`Host` AS `Host`,`global_priv`.`User` AS `User`,if(json_value(`global_priv`.`Priv`,'$.plugin') in ('mysql_native_password','mysql_old_password'),ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),''),'') AS `Password`,if(json_value(`global_priv`.`Priv`,'$.access') & 1,'Y','N') AS `Select_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2,'Y','N') AS `Insert_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4,'Y','N') AS `Update_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8,'Y','N') AS `Delete_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16,'Y','N') AS `Create_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32,'Y','N') AS `Drop_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 64,'Y','N') AS `Reload_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 128,'Y','N') AS `Shutdown_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 256,'Y','N') AS `Process_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 512,'Y','N') AS `File_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1024,'Y','N') AS `Grant_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2048,'Y','N') AS `References_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4096,'Y','N') AS `Index_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8192,'Y','N') AS `Alter_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16384,'Y','N') AS `Show_db_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32768,'Y','N') AS `Super_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 65536,'Y','N') AS `Create_tmp_table_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 131072,'Y','N') AS `Lock_tables_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 262144,'Y','N') AS `Execute_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 524288,'Y','N') AS `Repl_slave_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1048576,'Y','N') AS `Repl_client_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2097152,'Y','N') AS `Create_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4194304,'Y','N') AS `Show_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8388608,'Y','N') AS `Create_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16777216,'Y','N') AS `Alter_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 33554432,'Y','N') AS `Create_user_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 67108864,'Y','N') AS `Event_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 134217728,'Y','N') AS `Trigger_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 268435456,'Y','N') AS `Create_tablespace_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 536870912,'Y','N') AS `Delete_history_priv`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.ssl_type'),0) + 1,'','ANY','X509','SPECIFIED') AS `ssl_type`,ifnull(json_value(`global_priv`.`Priv`,'$.ssl_cipher'),'') AS `ssl_cipher`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_issuer'),'') AS `x509_issuer`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_subject'),'') AS `x509_subject`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_questions'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_updates'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_connections'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_user_connections'),0) as signed) AS `max_user_connections`,ifnull(json_value(`global_priv`.`Priv`,'$.plugin'),'') AS `plugin`,ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),'') AS `authentication_string`,if(ifnull(json_value(`global_priv`.`Priv`,'$.password_last_changed'),1) = 0,'Y','N') AS `password_expired`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.is_role'),0) + 1,'N','Y') AS `is_role`,ifnull(json_value(`global_priv`.`Priv`,'$.default_role'),'') AS `default_role`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_statement_time'),0.0) as decimal(12,6)) AS `max_statement_time` from `global_priv`	latin1	latin1_swedish_ci
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `ret` tinyint(1) NOT NULL DEFAULT 0,
-  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 NOT NULL,
   PRIMARY KEY (`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
 show create table global_priv;
 Table	Create Table
 global_priv	CREATE TABLE `global_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
 show create table procs_priv;
 Table	Create Table
 procs_priv	CREATE TABLE `procs_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8_bin NOT NULL,
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
 show create table servers;
 Table	Create Table
 servers	CREATE TABLE `servers` (
@@ -133,11 +133,11 @@ servers	CREATE TABLE `servers` (
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` varchar(512) NOT NULL DEFAULT '',
   PRIMARY KEY (`Server_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;
 Table	Create Table
 proc	CREATE TABLE `proc` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL,
   `specific_name` char(64) NOT NULL DEFAULT '',
@@ -148,25 +148,25 @@ proc	CREATE TABLE `proc` (
   `param_list` blob NOT NULL,
   `returns` longblob NOT NULL,
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `comment` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE',
   PRIMARY KEY (`db`,`name`,`type`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
 show create table event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `execute_at` datetime DEFAULT NULL,
   `interval_value` int(11) DEFAULT NULL,
   `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
@@ -178,15 +178,15 @@ event	CREATE TABLE `event` (
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
   `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `originator` int(10) unsigned NOT NULL,
   `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
 show create table general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
@@ -196,7 +196,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -213,40 +213,40 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 show create table table_stats;
 Table	Create Table
 table_stats	CREATE TABLE `table_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `cardinality` bigint(21) unsigned DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
 show create table column_stats;
 Table	Create Table
 column_stats	CREATE TABLE `column_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `column_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `column_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `min_value` varbinary(255) DEFAULT NULL,
   `max_value` varbinary(255) DEFAULT NULL,
   `nulls_ratio` decimal(12,4) DEFAULT NULL,
   `avg_length` decimal(12,4) DEFAULT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   `hist_size` tinyint(3) unsigned DEFAULT NULL,
-  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8_bin DEFAULT NULL,
+  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8mb3_bin DEFAULT NULL,
   `histogram` varbinary(255) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
 show create table index_stats;
 Table	Create Table
 index_stats	CREATE TABLE `index_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `prefix_arity` int(11) unsigned NOT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`index_name`,`prefix_arity`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
 show tables;
 Tables_in_test
diff --git a/mysql-test/main/system_mysql_db_fix40123.result b/mysql-test/main/system_mysql_db_fix40123.result
index f467f7a1c53..127e2c49642 100644
--- a/mysql-test/main/system_mysql_db_fix40123.result
+++ b/mysql-test/main/system_mysql_db_fix40123.result
@@ -72,92 +72,92 @@ user
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
 show create table user;
 View	Create View	character_set_client	collation_connection
 user	CREATE ALGORITHM=UNDEFINED DEFINER=`mariadb.sys`@`localhost` SQL SECURITY DEFINER VIEW `user` AS select `global_priv`.`Host` AS `Host`,`global_priv`.`User` AS `User`,if(json_value(`global_priv`.`Priv`,'$.plugin') in ('mysql_native_password','mysql_old_password'),ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),''),'') AS `Password`,if(json_value(`global_priv`.`Priv`,'$.access') & 1,'Y','N') AS `Select_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2,'Y','N') AS `Insert_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4,'Y','N') AS `Update_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8,'Y','N') AS `Delete_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16,'Y','N') AS `Create_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32,'Y','N') AS `Drop_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 64,'Y','N') AS `Reload_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 128,'Y','N') AS `Shutdown_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 256,'Y','N') AS `Process_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 512,'Y','N') AS `File_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1024,'Y','N') AS `Grant_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2048,'Y','N') AS `References_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4096,'Y','N') AS `Index_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8192,'Y','N') AS `Alter_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16384,'Y','N') AS `Show_db_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32768,'Y','N') AS `Super_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 65536,'Y','N') AS `Create_tmp_table_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 131072,'Y','N') AS `Lock_tables_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 262144,'Y','N') AS `Execute_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 524288,'Y','N') AS `Repl_slave_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1048576,'Y','N') AS `Repl_client_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2097152,'Y','N') AS `Create_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4194304,'Y','N') AS `Show_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8388608,'Y','N') AS `Create_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16777216,'Y','N') AS `Alter_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 33554432,'Y','N') AS `Create_user_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 67108864,'Y','N') AS `Event_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 134217728,'Y','N') AS `Trigger_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 268435456,'Y','N') AS `Create_tablespace_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 536870912,'Y','N') AS `Delete_history_priv`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.ssl_type'),0) + 1,'','ANY','X509','SPECIFIED') AS `ssl_type`,ifnull(json_value(`global_priv`.`Priv`,'$.ssl_cipher'),'') AS `ssl_cipher`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_issuer'),'') AS `x509_issuer`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_subject'),'') AS `x509_subject`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_questions'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_updates'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_connections'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_user_connections'),0) as signed) AS `max_user_connections`,ifnull(json_value(`global_priv`.`Priv`,'$.plugin'),'') AS `plugin`,ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),'') AS `authentication_string`,if(ifnull(json_value(`global_priv`.`Priv`,'$.password_last_changed'),1) = 0,'Y','N') AS `password_expired`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.is_role'),0) + 1,'N','Y') AS `is_role`,ifnull(json_value(`global_priv`.`Priv`,'$.default_role'),'') AS `default_role`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_statement_time'),0.0) as decimal(12,6)) AS `max_statement_time` from `global_priv`	latin1	latin1_swedish_ci
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `ret` tinyint(1) NOT NULL DEFAULT 0,
-  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 NOT NULL,
   PRIMARY KEY (`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
 show create table global_priv;
 Table	Create Table
 global_priv	CREATE TABLE `global_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
 show create table procs_priv;
 Table	Create Table
 procs_priv	CREATE TABLE `procs_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8_bin NOT NULL,
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
 show create table servers;
 Table	Create Table
 servers	CREATE TABLE `servers` (
@@ -171,11 +171,11 @@ servers	CREATE TABLE `servers` (
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` varchar(512) NOT NULL DEFAULT '',
   PRIMARY KEY (`Server_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;
 Table	Create Table
 proc	CREATE TABLE `proc` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL,
   `specific_name` char(64) NOT NULL DEFAULT '',
@@ -186,25 +186,25 @@ proc	CREATE TABLE `proc` (
   `param_list` blob NOT NULL,
   `returns` longblob NOT NULL,
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `comment` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE',
   PRIMARY KEY (`db`,`name`,`type`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
 show create table event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `execute_at` datetime DEFAULT NULL,
   `interval_value` int(11) DEFAULT NULL,
   `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
@@ -216,15 +216,15 @@ event	CREATE TABLE `event` (
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
   `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `originator` int(10) unsigned NOT NULL,
   `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
 show create table general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
@@ -234,7 +234,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -251,41 +251,41 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 show create table table_stats;
 Table	Create Table
 table_stats	CREATE TABLE `table_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `cardinality` bigint(21) unsigned DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
 show create table column_stats;
 Table	Create Table
 column_stats	CREATE TABLE `column_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `column_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `column_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `min_value` varbinary(255) DEFAULT NULL,
   `max_value` varbinary(255) DEFAULT NULL,
   `nulls_ratio` decimal(12,4) DEFAULT NULL,
   `avg_length` decimal(12,4) DEFAULT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   `hist_size` tinyint(3) unsigned DEFAULT NULL,
-  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8_bin DEFAULT NULL,
+  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8mb3_bin DEFAULT NULL,
   `histogram` varbinary(255) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
 show create table index_stats;
 Table	Create Table
 index_stats	CREATE TABLE `index_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `prefix_arity` int(11) unsigned NOT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`index_name`,`prefix_arity`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
 DROP VIEW user;
 DROP TABLE db, host, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos, global_priv;
 show tables;
diff --git a/mysql-test/main/system_mysql_db_fix50030.result b/mysql-test/main/system_mysql_db_fix50030.result
index 84482e4c74f..fd0074c7f54 100644
--- a/mysql-test/main/system_mysql_db_fix50030.result
+++ b/mysql-test/main/system_mysql_db_fix50030.result
@@ -76,92 +76,92 @@ user
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
 show create table user;
 View	Create View	character_set_client	collation_connection
 user	CREATE ALGORITHM=UNDEFINED DEFINER=`mariadb.sys`@`localhost` SQL SECURITY DEFINER VIEW `user` AS select `global_priv`.`Host` AS `Host`,`global_priv`.`User` AS `User`,if(json_value(`global_priv`.`Priv`,'$.plugin') in ('mysql_native_password','mysql_old_password'),ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),''),'') AS `Password`,if(json_value(`global_priv`.`Priv`,'$.access') & 1,'Y','N') AS `Select_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2,'Y','N') AS `Insert_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4,'Y','N') AS `Update_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8,'Y','N') AS `Delete_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16,'Y','N') AS `Create_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32,'Y','N') AS `Drop_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 64,'Y','N') AS `Reload_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 128,'Y','N') AS `Shutdown_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 256,'Y','N') AS `Process_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 512,'Y','N') AS `File_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1024,'Y','N') AS `Grant_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2048,'Y','N') AS `References_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4096,'Y','N') AS `Index_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8192,'Y','N') AS `Alter_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16384,'Y','N') AS `Show_db_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32768,'Y','N') AS `Super_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 65536,'Y','N') AS `Create_tmp_table_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 131072,'Y','N') AS `Lock_tables_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 262144,'Y','N') AS `Execute_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 524288,'Y','N') AS `Repl_slave_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1048576,'Y','N') AS `Repl_client_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2097152,'Y','N') AS `Create_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4194304,'Y','N') AS `Show_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8388608,'Y','N') AS `Create_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16777216,'Y','N') AS `Alter_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 33554432,'Y','N') AS `Create_user_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 67108864,'Y','N') AS `Event_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 134217728,'Y','N') AS `Trigger_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 268435456,'Y','N') AS `Create_tablespace_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 536870912,'Y','N') AS `Delete_history_priv`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.ssl_type'),0) + 1,'','ANY','X509','SPECIFIED') AS `ssl_type`,ifnull(json_value(`global_priv`.`Priv`,'$.ssl_cipher'),'') AS `ssl_cipher`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_issuer'),'') AS `x509_issuer`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_subject'),'') AS `x509_subject`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_questions'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_updates'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_connections'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_user_connections'),0) as signed) AS `max_user_connections`,ifnull(json_value(`global_priv`.`Priv`,'$.plugin'),'') AS `plugin`,ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),'') AS `authentication_string`,if(ifnull(json_value(`global_priv`.`Priv`,'$.password_last_changed'),1) = 0,'Y','N') AS `password_expired`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.is_role'),0) + 1,'N','Y') AS `is_role`,ifnull(json_value(`global_priv`.`Priv`,'$.default_role'),'') AS `default_role`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_statement_time'),0.0) as decimal(12,6)) AS `max_statement_time` from `global_priv`	latin1	latin1_swedish_ci
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `ret` tinyint(1) NOT NULL DEFAULT 0,
-  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 NOT NULL,
   PRIMARY KEY (`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
 show create table global_priv;
 Table	Create Table
 global_priv	CREATE TABLE `global_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
 show create table procs_priv;
 Table	Create Table
 procs_priv	CREATE TABLE `procs_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8_bin NOT NULL,
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
 show create table servers;
 Table	Create Table
 servers	CREATE TABLE `servers` (
@@ -175,11 +175,11 @@ servers	CREATE TABLE `servers` (
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` char(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`Server_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;
 Table	Create Table
 proc	CREATE TABLE `proc` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL,
   `specific_name` char(64) NOT NULL DEFAULT '',
@@ -190,25 +190,25 @@ proc	CREATE TABLE `proc` (
   `param_list` blob NOT NULL DEFAULT '',
   `returns` longblob NOT NULL,
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `comment` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE',
   PRIMARY KEY (`db`,`name`,`type`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
 show create table event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `execute_at` datetime DEFAULT NULL,
   `interval_value` int(11) DEFAULT NULL,
   `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
@@ -220,15 +220,15 @@ event	CREATE TABLE `event` (
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
   `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `originator` int(10) unsigned NOT NULL,
   `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
 show create table general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
@@ -238,7 +238,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -255,41 +255,41 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 show create table table_stats;
 Table	Create Table
 table_stats	CREATE TABLE `table_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `cardinality` bigint(21) unsigned DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
 show create table column_stats;
 Table	Create Table
 column_stats	CREATE TABLE `column_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `column_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `column_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `min_value` varbinary(255) DEFAULT NULL,
   `max_value` varbinary(255) DEFAULT NULL,
   `nulls_ratio` decimal(12,4) DEFAULT NULL,
   `avg_length` decimal(12,4) DEFAULT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   `hist_size` tinyint(3) unsigned DEFAULT NULL,
-  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8_bin DEFAULT NULL,
+  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8mb3_bin DEFAULT NULL,
   `histogram` varbinary(255) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
 show create table index_stats;
 Table	Create Table
 index_stats	CREATE TABLE `index_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `prefix_arity` int(11) unsigned NOT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`index_name`,`prefix_arity`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
 DROP VIEW user;
 DROP TABLE db, host, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos, global_priv;
 show tables;
diff --git a/mysql-test/main/system_mysql_db_fix50117.result b/mysql-test/main/system_mysql_db_fix50117.result
index 73ba79e2cee..a7d705c4158 100644
--- a/mysql-test/main/system_mysql_db_fix50117.result
+++ b/mysql-test/main/system_mysql_db_fix50117.result
@@ -56,92 +56,92 @@ user
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
-  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
+  `Delete_history_priv` enum('N','Y') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Database privileges'
 show create table user;
 View	Create View	character_set_client	collation_connection
 user	CREATE ALGORITHM=UNDEFINED DEFINER=`mariadb.sys`@`localhost` SQL SECURITY DEFINER VIEW `user` AS select `global_priv`.`Host` AS `Host`,`global_priv`.`User` AS `User`,if(json_value(`global_priv`.`Priv`,'$.plugin') in ('mysql_native_password','mysql_old_password'),ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),''),'') AS `Password`,if(json_value(`global_priv`.`Priv`,'$.access') & 1,'Y','N') AS `Select_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2,'Y','N') AS `Insert_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4,'Y','N') AS `Update_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8,'Y','N') AS `Delete_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16,'Y','N') AS `Create_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32,'Y','N') AS `Drop_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 64,'Y','N') AS `Reload_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 128,'Y','N') AS `Shutdown_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 256,'Y','N') AS `Process_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 512,'Y','N') AS `File_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1024,'Y','N') AS `Grant_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2048,'Y','N') AS `References_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4096,'Y','N') AS `Index_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8192,'Y','N') AS `Alter_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16384,'Y','N') AS `Show_db_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 32768,'Y','N') AS `Super_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 65536,'Y','N') AS `Create_tmp_table_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 131072,'Y','N') AS `Lock_tables_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 262144,'Y','N') AS `Execute_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 524288,'Y','N') AS `Repl_slave_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 1048576,'Y','N') AS `Repl_client_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 2097152,'Y','N') AS `Create_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 4194304,'Y','N') AS `Show_view_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 8388608,'Y','N') AS `Create_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 16777216,'Y','N') AS `Alter_routine_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 33554432,'Y','N') AS `Create_user_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 67108864,'Y','N') AS `Event_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 134217728,'Y','N') AS `Trigger_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 268435456,'Y','N') AS `Create_tablespace_priv`,if(json_value(`global_priv`.`Priv`,'$.access') & 536870912,'Y','N') AS `Delete_history_priv`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.ssl_type'),0) + 1,'','ANY','X509','SPECIFIED') AS `ssl_type`,ifnull(json_value(`global_priv`.`Priv`,'$.ssl_cipher'),'') AS `ssl_cipher`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_issuer'),'') AS `x509_issuer`,ifnull(json_value(`global_priv`.`Priv`,'$.x509_subject'),'') AS `x509_subject`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_questions'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_updates'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_connections'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_user_connections'),0) as signed) AS `max_user_connections`,ifnull(json_value(`global_priv`.`Priv`,'$.plugin'),'') AS `plugin`,ifnull(json_value(`global_priv`.`Priv`,'$.authentication_string'),'') AS `authentication_string`,if(ifnull(json_value(`global_priv`.`Priv`,'$.password_last_changed'),1) = 0,'Y','N') AS `password_expired`,elt(ifnull(json_value(`global_priv`.`Priv`,'$.is_role'),0) + 1,'N','Y') AS `is_role`,ifnull(json_value(`global_priv`.`Priv`,'$.default_role'),'') AS `default_role`,cast(ifnull(json_value(`global_priv`.`Priv`,'$.max_statement_time'),0.0) as decimal(12,6)) AS `max_statement_time` from `global_priv`	latin1	latin1_swedish_ci
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `ret` tinyint(1) NOT NULL DEFAULT 0,
-  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 NOT NULL,
   PRIMARY KEY (`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions'
 show create table global_priv;
 Table	Create Table
 global_priv	CREATE TABLE `global_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
   PRIMARY KEY (`Host`,`User`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger','Delete versioning rows') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Table privileges'
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Column privileges'
 show create table procs_priv;
 Table	Create Table
 procs_priv	CREATE TABLE `procs_priv` (
-  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8_bin NOT NULL,
-  `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Host` char(60) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
   `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
   KEY `Grantor` (`Grantor`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Procedure privileges'
 show create table servers;
 Table	Create Table
 servers	CREATE TABLE `servers` (
@@ -155,11 +155,11 @@ servers	CREATE TABLE `servers` (
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` char(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`Server_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;
 Table	Create Table
 proc	CREATE TABLE `proc` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `type` enum('FUNCTION','PROCEDURE','PACKAGE','PACKAGE BODY') NOT NULL,
   `specific_name` char(64) NOT NULL DEFAULT '',
@@ -170,25 +170,25 @@ proc	CREATE TABLE `proc` (
   `param_list` blob NOT NULL,
   `returns` longblob NOT NULL,
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `comment` text CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE',
   PRIMARY KEY (`db`,`name`,`type`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Stored Procedures'
 show create table event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `db` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `name` char(64) NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` varchar(384) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `definer` varchar(384) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `execute_at` datetime DEFAULT NULL,
   `interval_value` int(11) DEFAULT NULL,
   `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
@@ -200,15 +200,15 @@ event	CREATE TABLE `event` (
   `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
   `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
   `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') NOT NULL DEFAULT '',
-  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT '',
   `originator` int(10) unsigned NOT NULL,
   `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
-  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Events'
 show create table general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
@@ -218,7 +218,7 @@ general_log	CREATE TABLE `general_log` (
   `server_id` int(10) unsigned NOT NULL,
   `command_type` varchar(64) NOT NULL,
   `argument` mediumtext NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='General log'
 show create table slow_log;
 Table	Create Table
 slow_log	CREATE TABLE `slow_log` (
@@ -235,41 +235,41 @@ slow_log	CREATE TABLE `slow_log` (
   `sql_text` mediumtext NOT NULL,
   `thread_id` bigint(21) unsigned NOT NULL,
   `rows_affected` int(11) NOT NULL
-) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
+) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COMMENT='Slow log'
 show create table table_stats;
 Table	Create Table
 table_stats	CREATE TABLE `table_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `cardinality` bigint(21) unsigned DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Tables'
 show create table column_stats;
 Table	Create Table
 column_stats	CREATE TABLE `column_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `column_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `column_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `min_value` varbinary(255) DEFAULT NULL,
   `max_value` varbinary(255) DEFAULT NULL,
   `nulls_ratio` decimal(12,4) DEFAULT NULL,
   `avg_length` decimal(12,4) DEFAULT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   `hist_size` tinyint(3) unsigned DEFAULT NULL,
-  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8_bin DEFAULT NULL,
+  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB') COLLATE utf8mb3_bin DEFAULT NULL,
   `histogram` varbinary(255) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`column_name`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
 show create table index_stats;
 Table	Create Table
 index_stats	CREATE TABLE `index_stats` (
-  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
-  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8mb3_bin NOT NULL,
   `prefix_arity` int(11) unsigned NOT NULL,
   `avg_frequency` decimal(12,4) DEFAULT NULL,
   PRIMARY KEY (`db_name`,`table_name`,`index_name`,`prefix_arity`)
-) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
+) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Indexes'
 DROP VIEW user;
 DROP TABLE db, host, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos, global_priv;
 show tables;
diff --git a/mysql-test/main/type_blob.result b/mysql-test/main/type_blob.result
index 28f5d8fb868..c2739e4b166 100644
--- a/mysql-test/main/type_blob.result
+++ b/mysql-test/main/type_blob.result
@@ -31,7 +31,7 @@ t3	CREATE TABLE `t3` (
 show create TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c` mediumtext CHARACTER SET utf8 NOT NULL
+  `c` mediumtext CHARACTER SET utf8mb3 NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2,t3,t4;
 CREATE TABLE t1 (a char(257) default "hello");
@@ -1081,7 +1081,7 @@ CREATE TABLE t1 (a TEXT(1431655798) CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` longtext CHARACTER SET utf8 DEFAULT NULL
+  `a` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 create table t1 (a int);
diff --git a/mysql-test/main/type_hex_hybrid.result b/mysql-test/main/type_hex_hybrid.result
index 26ff385a709..afe338a1cd8 100644
--- a/mysql-test/main/type_hex_hybrid.result
+++ b/mysql-test/main/type_hex_hybrid.result
@@ -9,8 +9,8 @@ CREATE TABLE t1 (a DECIMAL(10,3));
 INSERT INTO t1 VALUES (10.0),(10.1);
 SELECT CHARSET('a'),CHARSET(0x61),LENGTH(CHARSET('a'))+a,LENGTH(CHARSET(0x61))+a FROM t1;
 CHARSET('a')	CHARSET(0x61)	LENGTH(CHARSET('a'))+a	LENGTH(CHARSET(0x61))+a
-utf8	binary	14.000	16.000
-utf8	binary	14.100	16.100
+utf8mb3	binary	17.000	16.000
+utf8mb3	binary	17.100	16.100
 SELECT * FROM t1 WHERE LENGTH(CHARSET('a'))+a<=>LENGTH(CHARSET(0x61))+a;
 a
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE LENGTH(CHARSET('a'))+a<=>LENGTH(CHARSET(0x61))+a;
diff --git a/mysql-test/main/type_nchar.result b/mysql-test/main/type_nchar.result
index 95741d37e2a..97c66d8d9a1 100644
--- a/mysql-test/main/type_nchar.result
+++ b/mysql-test/main/type_nchar.result
@@ -3,48 +3,48 @@ create table t1 (c nchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national char(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national varchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nvarchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nchar varchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national character varying(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nchar varying(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `c` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result
index 52bc3ccb0dc..ea1a55464d5 100644
--- a/mysql-test/main/union.result
+++ b/mysql-test/main/union.result
@@ -1273,8 +1273,8 @@ c ENUM("one", "two")
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('ä','ö','ü') CHARACTER SET utf8 NOT NULL DEFAULT 'ü',
-  `b` enum('one','two') CHARACTER SET utf8 DEFAULT NULL,
+  `a` enum('ä','ö','ü') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'ü',
+  `b` enum('one','two') CHARACTER SET utf8mb3 DEFAULT NULL,
   `c` enum('one','two') DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
@@ -1445,9 +1445,9 @@ t2	CREATE TABLE `t2` (
   `f3` binary(1) DEFAULT NULL,
   `f4` binary(5) DEFAULT NULL,
   `f5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `f6` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
+  `f6` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL,
   `f7` text DEFAULT NULL,
-  `f8` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `f8` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 CREATE TABLE t1
@@ -1465,10 +1465,10 @@ SELECT c_varchar, c_varchar, c_varchar, c_varchar FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c_tinytext` text CHARACTER SET utf8 DEFAULT NULL,
-  `c_text` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `c_mediumtext` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `c_longtext` longtext CHARACTER SET utf8 DEFAULT NULL
+  `c_tinytext` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c_text` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c_mediumtext` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `c_longtext` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 DROP TABLE t1;
diff --git a/mysql-test/main/upgrade.result b/mysql-test/main/upgrade.result
index 887a53887fe..7c6df30fa74 100644
--- a/mysql-test/main/upgrade.result
+++ b/mysql-test/main/upgrade.result
@@ -110,7 +110,7 @@ Database (%a-b-c%)
 a-b-c
 show create view `a-b-c`.v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `a`.`f1` AS `f1` from (`a-b-c`.`t1` `a` join `information_schema`.`tables` `b`) where convert(`a`.`f1` using utf8) = `b`.`TABLE_NAME`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `a`.`f1` AS `f1` from (`a-b-c`.`t1` `a` join `information_schema`.`tables` `b`) where convert(`a`.`f1` using utf8mb3) = `b`.`TABLE_NAME`	utf8mb3	utf8mb3_general_ci
 select * from `a-b-c`.v1;
 f1
 drop database `a-b-c`;
diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result
index ed8a7ada8b3..49af27b8a5f 100644
--- a/mysql-test/main/variables.result
+++ b/mysql-test/main/variables.result
@@ -859,7 +859,7 @@ select @@max_heap_table_size > 0;
 1
 select @@character_set_system;
 @@character_set_system
-utf8
+utf8mb3
 set global character_set_system = latin1;
 ERROR HY000: Variable 'character_set_system' is a read only variable
 set @@global.version_compile_os='234';