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.

29 files changed, 29 insertions, 29 deletions

diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
index 9d4c43b1a8f..4742a9a9ceb 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -21,7 +21,7 @@ INNODB_BUFFER_PAGE	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE` (
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE','IO_PIN') NOT NULL,
   `IS_OLD` int(1) NOT NULL DEFAULT 0,
   `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
 DROP TEMPORARY TABLE t1;
 CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE LIMIT 0;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
index 42d33fdbeac..43494bb5057 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -21,7 +21,7 @@ INNODB_BUFFER_PAGE_LRU	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE_LRU` (
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE','IO_PIN') NOT NULL,
   `IS_OLD` int(1) DEFAULT NULL,
   `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
 DROP TEMPORARY TABLE t1;
 CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU LIMIT 0;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
index be5c31a6b57..5e0c2ae8e89 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
@@ -33,4 +33,4 @@ INNODB_BUFFER_POOL_STATS	CREATE TEMPORARY TABLE `INNODB_BUFFER_POOL_STATS` (
   `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0,
   `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
   `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.result b/mysql-test/suite/innodb_i_s/innodb_cmp.result
index 47a92e42e59..d06bdf1dbc4 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.result
@@ -7,4 +7,4 @@ INNODB_CMP	CREATE TEMPORARY TABLE `INNODB_CMP` (
   `compress_time` int(11) NOT NULL DEFAULT 0,
   `uncompress_ops` int(11) NOT NULL DEFAULT 0,
   `uncompress_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
index bcde9a2e9dd..5037957681a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
@@ -9,4 +9,4 @@ INNODB_CMP_PER_INDEX	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX` (
   `compress_time` int(11) NOT NULL DEFAULT 0,
   `uncompress_ops` int(11) NOT NULL DEFAULT 0,
   `uncompress_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
index 97ba44ec641..d044cf077ac 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
@@ -9,4 +9,4 @@ INNODB_CMP_PER_INDEX_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX_RESET` (
   `compress_time` int(11) NOT NULL DEFAULT 0,
   `uncompress_ops` int(11) NOT NULL DEFAULT 0,
   `uncompress_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
index 3d247f2cbc1..4a6ef866932 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
@@ -7,4 +7,4 @@ INNODB_CMP_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_RESET` (
   `compress_time` int(11) NOT NULL DEFAULT 0,
   `uncompress_ops` int(11) NOT NULL DEFAULT 0,
   `uncompress_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
index e1dd5d0a314..4f66f491b6b 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
@@ -7,4 +7,4 @@ INNODB_CMPMEM	CREATE TEMPORARY TABLE `INNODB_CMPMEM` (
   `pages_free` int(11) NOT NULL DEFAULT 0,
   `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
   `relocation_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
index 178cd244f9a..0f7adfc0fce 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
@@ -7,4 +7,4 @@ INNODB_CMPMEM_RESET	CREATE TEMPORARY TABLE `INNODB_CMPMEM_RESET` (
   `pages_free` int(11) NOT NULL DEFAULT 0,
   `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
   `relocation_time` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
index 920ec782ac5..7c2c2a4d183 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
@@ -2,4 +2,4 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED;
 Table	Create Table
 INNODB_FT_BEING_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_BEING_DELETED` (
   `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.result b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
index dcb11b1805c..5d2f7ec87d5 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_config.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
@@ -3,4 +3,4 @@ Table	Create Table
 INNODB_FT_CONFIG	CREATE TEMPORARY TABLE `INNODB_FT_CONFIG` (
   `KEY` varchar(193) NOT NULL DEFAULT '',
   `VALUE` varchar(193) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
index c680665a256..6f4e0012c5f 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
@@ -2,4 +2,4 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD;
 Table	Create Table
 INNODB_FT_DEFAULT_STOPWORD	CREATE TEMPORARY TABLE `INNODB_FT_DEFAULT_STOPWORD` (
   `value` varchar(18) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
index ab1a816eee8..6224ce747af 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
@@ -2,4 +2,4 @@ SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DELETED;
 Table	Create Table
 INNODB_FT_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_DELETED` (
   `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
index b95cb1ddf28..a17b9446c9f 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
@@ -7,4 +7,4 @@ INNODB_FT_INDEX_CACHE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_CACHE` (
   `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
   `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
   `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
index 0003e7d6741..8ec767ce5d1 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
@@ -7,4 +7,4 @@ INNODB_FT_INDEX_TABLE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_TABLE` (
   `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
   `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
   `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
index 4142f142d3b..8d8c2d158a7 100644
--- a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
+++ b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
@@ -5,4 +5,4 @@ INNODB_LOCK_WAITS	CREATE TEMPORARY TABLE `INNODB_LOCK_WAITS` (
   `requested_lock_id` varchar(81) NOT NULL DEFAULT '',
   `blocking_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
   `blocking_lock_id` varchar(81) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.result b/mysql-test/suite/innodb_i_s/innodb_locks.result
index 6811a968869..977776ae2ec 100644
--- a/mysql-test/suite/innodb_i_s/innodb_locks.result
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.result
@@ -11,7 +11,7 @@ INNODB_LOCKS	CREATE TEMPORARY TABLE `INNODB_LOCKS` (
   `lock_page` int(11) unsigned DEFAULT NULL,
   `lock_rec` int(11) unsigned DEFAULT NULL,
   `lock_data` varchar(8192) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_LOCKS;
 DROP TEMPORARY TABLE t1;
 CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS LIMIT 0;
diff --git a/mysql-test/suite/innodb_i_s/innodb_metrics.result b/mysql-test/suite/innodb_i_s/innodb_metrics.result
index c6e0c7ac1d1..7687fa8fc20 100644
--- a/mysql-test/suite/innodb_i_s/innodb_metrics.result
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.result
@@ -18,7 +18,7 @@ INNODB_METRICS	CREATE TEMPORARY TABLE `INNODB_METRICS` (
   `ENABLED` int(1) NOT NULL DEFAULT 0,
   `TYPE` enum('value','status_counter','set_owner','set_member','counter') NOT NULL,
   `COMMENT` varchar(193) NOT NULL DEFAULT ''
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_METRICS;
 DROP TEMPORARY TABLE t1;
 CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_METRICS LIMIT 0;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
index fbce9faac99..a4f13d19854 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
@@ -7,4 +7,4 @@ INNODB_SYS_COLUMNS	CREATE TEMPORARY TABLE `INNODB_SYS_COLUMNS` (
   `MTYPE` int(11) NOT NULL DEFAULT 0,
   `PRTYPE` int(11) NOT NULL DEFAULT 0,
   `LEN` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
index 9c5437ff64e..d69645e139a 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
@@ -4,4 +4,4 @@ INNODB_SYS_FIELDS	CREATE TEMPORARY TABLE `INNODB_SYS_FIELDS` (
   `INDEX_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
   `NAME` varchar(64) NOT NULL DEFAULT '',
   `POS` int(11) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
index 8dc7cbb2c53..1995db45f5d 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
@@ -6,4 +6,4 @@ INNODB_SYS_FOREIGN	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN` (
   `REF_NAME` varchar(193) NOT NULL DEFAULT '',
   `N_COLS` int(11) unsigned NOT NULL DEFAULT 0,
   `TYPE` int(11) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
index 8f1134fb36d..48d98a371c0 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
@@ -5,4 +5,4 @@ INNODB_SYS_FOREIGN_COLS	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN_COLS` (
   `FOR_COL_NAME` varchar(64) NOT NULL DEFAULT '',
   `REF_COL_NAME` varchar(64) NOT NULL DEFAULT '',
   `POS` int(11) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
index 6e76ea887cc..81d1447e60d 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
@@ -9,4 +9,4 @@ INNODB_SYS_INDEXES	CREATE TEMPORARY TABLE `INNODB_SYS_INDEXES` (
   `PAGE_NO` int(11) NOT NULL DEFAULT 0,
   `SPACE` int(11) NOT NULL DEFAULT 0,
   `MERGE_THRESHOLD` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
index 82c6c480587..49afc1cc4c8 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
@@ -9,4 +9,4 @@ INNODB_SYS_TABLES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLES` (
   `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic') DEFAULT NULL,
   `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
   `SPACE_TYPE` enum('Single','System') DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
index cc8728bc9ad..830ec87130f 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
@@ -10,4 +10,4 @@ INNODB_SYS_TABLESPACES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESPACES` (
   `FS_BLOCK_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
   `FILE_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
   `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
index ccc8a034e00..eefe5ee83a1 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
@@ -10,4 +10,4 @@ INNODB_SYS_TABLESTATS	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESTATS` (
   `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL DEFAULT 0,
   `AUTOINC` bigint(21) unsigned NOT NULL DEFAULT 0,
   `REF_COUNT` int(11) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
index 0d324a13bc6..831f29faa95 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
@@ -4,4 +4,4 @@ INNODB_SYS_VIRTUAL	CREATE TEMPORARY TABLE `INNODB_SYS_VIRTUAL` (
   `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
   `POS` int(11) unsigned NOT NULL DEFAULT 0,
   `BASE_POS` int(11) unsigned NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
index e824366632a..31a4805b275 100644
--- a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
@@ -11,4 +11,4 @@ INNODB_TABLESPACES_ENCRYPTION	CREATE TEMPORARY TABLE `INNODB_TABLESPACES_ENCRYPT
   `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
   `CURRENT_KEY_ID` int(11) unsigned NOT NULL DEFAULT 0,
   `ROTATING_OR_FLUSHING` int(1) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.result b/mysql-test/suite/innodb_i_s/innodb_trx.result
index 297899650c2..d4e10a99ee8 100644
--- a/mysql-test/suite/innodb_i_s/innodb_trx.result
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -23,7 +23,7 @@ INNODB_TRX	CREATE TEMPORARY TABLE `INNODB_TRX` (
   `trx_last_foreign_key_error` varchar(256) DEFAULT NULL,
   `trx_is_read_only` int(1) NOT NULL DEFAULT 0,
   `trx_autocommit_non_locking` int(1) NOT NULL DEFAULT 0
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_TRX;
 DROP TEMPORARY TABLE t1;
 CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX LIMIT 0;