Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

74 files changed, 594 insertions, 0 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
new file mode 100644
index 00000000..f48b9dd7
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -0,0 +1,28 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
+Table	Create Table
+INNODB_BUFFER_PAGE	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE` (
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `BLOCK_ID` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
+  `PAGE_STATE` enum('NOT_USED','MEMORY','REMOVE_HASH','FILE_PAGE') NOT NULL,
+  `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE') NOT NULL,
+  `IS_OLD` int(1) NOT NULL,
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page.test b/mysql-test/suite/innodb_i_s/innodb_buffer_page.test
new file mode 100644
index 00000000..089cead2
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.test
@@ -0,0 +1,9 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
+
+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;
+DROP TEMPORARY TABLE t1;
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
new file mode 100644
index 00000000..a8213aa7
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -0,0 +1,28 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
+Table	Create Table
+INNODB_BUFFER_PAGE_LRU	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE_LRU` (
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `LRU_POSITION` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED` int(1) NOT NULL,
+  `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE') NOT NULL,
+  `IS_OLD` int(1),
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.test b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.test
new file mode 100644
index 00000000..b969745f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.test
@@ -0,0 +1,9 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
+
+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;
+DROP TEMPORARY TABLE t1;
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
new file mode 100644
index 00000000..f7fdd38f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
@@ -0,0 +1,36 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
+Table	Create Table
+INNODB_BUFFER_POOL_STATS	CREATE TEMPORARY TABLE `INNODB_BUFFER_POOL_STATS` (
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `POOL_SIZE` bigint(21) unsigned NOT NULL,
+  `FREE_BUFFERS` bigint(21) unsigned NOT NULL,
+  `DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL,
+  `PENDING_READS` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG_RATE` float NOT NULL,
+  `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL,
+  `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL,
+  `PAGES_READ_RATE` float NOT NULL,
+  `PAGES_CREATE_RATE` float NOT NULL,
+  `PAGES_WRITTEN_RATE` float NOT NULL,
+  `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL,
+  `HIT_RATE` bigint(21) unsigned NOT NULL,
+  `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL,
+  `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL,
+  `READ_AHEAD_RATE` float NOT NULL,
+  `READ_AHEAD_EVICTED_RATE` float NOT NULL,
+  `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL,
+  `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.test b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.test
new file mode 100644
index 00000000..4dd396ef
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.opt b/mysql-test/suite/innodb_i_s/innodb_cmp.opt
new file mode 100644
index 00000000..4f9fa418
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.opt
@@ -0,0 +1 @@
+--innodb_cmp
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.result b/mysql-test/suite/innodb_i_s/innodb_cmp.result
new file mode 100644
index 00000000..2931eb1a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP;
+Table	Create Table
+INNODB_CMP	CREATE TEMPORARY TABLE `INNODB_CMP` (
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.test b/mysql-test/suite/innodb_i_s/innodb_cmp.test
new file mode 100644
index 00000000..a7ddff3e
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP;
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
new file mode 100644
index 00000000..d94e2d5a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
@@ -0,0 +1,12 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX;
+Table	Create Table
+INNODB_CMP_PER_INDEX	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX` (
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.test b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.test
new file mode 100644
index 00000000..9e91e8dd
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX;
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.opt b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.opt
new file mode 100644
index 00000000..37aab727
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.opt
@@ -0,0 +1 @@
+--innodb_cmp_per_index_reset
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
new file mode 100644
index 00000000..a9879973
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
@@ -0,0 +1,12 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX_RESET;
+Table	Create Table
+INNODB_CMP_PER_INDEX_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX_RESET` (
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.test b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.test
new file mode 100644
index 00000000..05220afe
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX_RESET;
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.opt b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.opt
new file mode 100644
index 00000000..01508468
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.opt
@@ -0,0 +1 @@
+--innodb_cmp_reset
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
new file mode 100644
index 00000000..f4cc2100
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_RESET;
+Table	Create Table
+INNODB_CMP_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_RESET` (
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.test b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.test
new file mode 100644
index 00000000..fe0d7196
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_RESET;
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
new file mode 100644
index 00000000..2cc7669d
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM;
+Table	Create Table
+INNODB_CMPMEM	CREATE TEMPORARY TABLE `INNODB_CMPMEM` (
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.test b/mysql-test/suite/innodb_i_s/innodb_cmpmem.test
new file mode 100644
index 00000000..6b5ddf9b
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM;
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.opt b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.opt
new file mode 100644
index 00000000..de3b60d9
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.opt
@@ -0,0 +1 @@
+--innodb_cmpmem_reset
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
new file mode 100644
index 00000000..4f946a2d
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
+Table	Create Table
+INNODB_CMPMEM_RESET	CREATE TEMPORARY TABLE `INNODB_CMPMEM_RESET` (
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.test b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.test
new file mode 100644
index 00000000..9ea5bdf5
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.opt b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.opt
new file mode 100644
index 00000000..9665b7c5
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.opt
@@ -0,0 +1 @@
+--innodb_ft_being_deleted
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
new file mode 100644
index 00000000..ead7446f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
@@ -0,0 +1,5 @@
+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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.test b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.test
new file mode 100644
index 00000000..cfe2836f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.opt b/mysql-test/suite/innodb_i_s/innodb_ft_config.opt
new file mode 100644
index 00000000..9e0e66f6
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.opt
@@ -0,0 +1 @@
+--innodb_ft_config
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.result b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
new file mode 100644
index 00000000..0abf9bdb
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
@@ -0,0 +1,6 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_CONFIG;
+Table	Create Table
+INNODB_FT_CONFIG	CREATE TEMPORARY TABLE `INNODB_FT_CONFIG` (
+  `KEY` varchar(193) NOT NULL,
+  `VALUE` varchar(193) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.test b/mysql-test/suite/innodb_i_s/innodb_ft_config.test
new file mode 100644
index 00000000..9d844250
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_CONFIG;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.opt b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.opt
new file mode 100644
index 00000000..2732f3a4
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.opt
@@ -0,0 +1 @@
+--innodb_ft_default_stopword
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
new file mode 100644
index 00000000..124888e1
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
@@ -0,0 +1,5 @@
+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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.test b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.test
new file mode 100644
index 00000000..b997c389
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.opt b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.opt
new file mode 100644
index 00000000..011d5a78
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.opt
@@ -0,0 +1 @@
+--innodb_ft_deleted
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
new file mode 100644
index 00000000..3ea52393
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
@@ -0,0 +1,5 @@
+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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.test b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.test
new file mode 100644
index 00000000..63b2eede
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DELETED;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.opt b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.opt
new file mode 100644
index 00000000..a076db4e
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.opt
@@ -0,0 +1 @@
+--innodb_ft_index_cache
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
new file mode 100644
index 00000000..02f3c731
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+Table	Create Table
+INNODB_FT_INDEX_CACHE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_CACHE` (
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.test b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.test
new file mode 100644
index 00000000..5e95dd05
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.opt b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.opt
new file mode 100644
index 00000000..ab47d299
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.opt
@@ -0,0 +1 @@
+--innodb_ft_index_table
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
new file mode 100644
index 00000000..6122f011
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+Table	Create Table
+INNODB_FT_INDEX_TABLE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_TABLE` (
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.test b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.test
new file mode 100644
index 00000000..984665f2
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
diff --git a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
new file mode 100644
index 00000000..0a974008
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
@@ -0,0 +1,8 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
+Table	Create Table
+INNODB_LOCK_WAITS	CREATE TEMPORARY TABLE `INNODB_LOCK_WAITS` (
+  `requesting_trx_id` bigint(21) unsigned NOT NULL,
+  `requested_lock_id` varchar(81) NOT NULL,
+  `blocking_trx_id` bigint(21) unsigned NOT NULL,
+  `blocking_lock_id` varchar(81) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_lock_waits.test b/mysql-test/suite/innodb_i_s/innodb_lock_waits.test
new file mode 100644
index 00000000..704537f8
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_lock_waits.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.result b/mysql-test/suite/innodb_i_s/innodb_locks.result
new file mode 100644
index 00000000..1a064e52
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.result
@@ -0,0 +1,18 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
+Table	Create Table
+INNODB_LOCKS	CREATE TEMPORARY TABLE `INNODB_LOCKS` (
+  `lock_id` varchar(81) NOT NULL,
+  `lock_trx_id` bigint(21) unsigned NOT NULL,
+  `lock_mode` enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC') NOT NULL,
+  `lock_type` enum('RECORD','TABLE') NOT NULL,
+  `lock_table` varchar(1024) NOT NULL,
+  `lock_index` varchar(1024),
+  `lock_space` int(11) unsigned,
+  `lock_page` int(11) unsigned,
+  `lock_rec` int(11) unsigned,
+  `lock_data` varchar(8192)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.test b/mysql-test/suite/innodb_i_s/innodb_locks.test
new file mode 100644
index 00000000..8327ae1f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.test
@@ -0,0 +1,9 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
+
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_metrics.result b/mysql-test/suite/innodb_i_s/innodb_metrics.result
new file mode 100644
index 00000000..8caa972d
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.result
@@ -0,0 +1,25 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
+Table	Create Table
+INNODB_METRICS	CREATE TEMPORARY TABLE `INNODB_METRICS` (
+  `NAME` varchar(193) NOT NULL,
+  `SUBSYSTEM` varchar(193) NOT NULL,
+  `COUNT` bigint(21) NOT NULL,
+  `MAX_COUNT` bigint(21),
+  `MIN_COUNT` bigint(21),
+  `AVG_COUNT` float,
+  `COUNT_RESET` bigint(21) NOT NULL,
+  `MAX_COUNT_RESET` bigint(21),
+  `MIN_COUNT_RESET` bigint(21),
+  `AVG_COUNT_RESET` float,
+  `TIME_ENABLED` datetime,
+  `TIME_DISABLED` datetime,
+  `TIME_ELAPSED` bigint(21),
+  `TIME_RESET` datetime,
+  `ENABLED` int(1) NOT NULL,
+  `TYPE` enum('value','status_counter','set_owner','set_member','counter') NOT NULL,
+  `COMMENT` varchar(193) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_metrics.test b/mysql-test/suite/innodb_i_s/innodb_metrics.test
new file mode 100644
index 00000000..446bfffb
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.test
@@ -0,0 +1,9 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
+
+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;
+DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_mutexes.result b/mysql-test/suite/innodb_i_s/innodb_mutexes.result
new file mode 100644
index 00000000..6abd25aa
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_mutexes.result
@@ -0,0 +1,8 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_MUTEXES;
+Table	Create Table
+INNODB_MUTEXES	CREATE TEMPORARY TABLE `INNODB_MUTEXES` (
+  `NAME` varchar(4000) NOT NULL,
+  `CREATE_FILE` varchar(4000) NOT NULL,
+  `CREATE_LINE` int(11) unsigned NOT NULL,
+  `OS_WAITS` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
new file mode 100644
index 00000000..3e2df356
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
@@ -0,0 +1,10 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
+Table	Create Table
+INNODB_SYS_COLUMNS	CREATE TEMPORARY TABLE `INNODB_SYS_COLUMNS` (
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` bigint(21) unsigned NOT NULL,
+  `MTYPE` int(11) NOT NULL,
+  `PRTYPE` int(11) NOT NULL,
+  `LEN` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_columns.test b/mysql-test/suite/innodb_i_s/innodb_sys_columns.test
new file mode 100644
index 00000000..73332697
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_columns.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
new file mode 100644
index 00000000..94d881bd
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
@@ -0,0 +1,6 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_DATAFILES;
+Table	Create Table
+INNODB_SYS_DATAFILES	CREATE TEMPORARY TABLE `INNODB_SYS_DATAFILES` (
+  `SPACE` int(11) unsigned NOT NULL,
+  `PATH` varchar(4000) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
new file mode 100644
index 00000000..eb4cb5e5
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
@@ -0,0 +1,7 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
+Table	Create Table
+INNODB_SYS_FIELDS	CREATE TEMPORARY TABLE `INNODB_SYS_FIELDS` (
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_fields.test b/mysql-test/suite/innodb_i_s/innodb_sys_fields.test
new file mode 100644
index 00000000..1559eb39
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_fields.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
new file mode 100644
index 00000000..2cba1cb7
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
@@ -0,0 +1,9 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
+Table	Create Table
+INNODB_SYS_FOREIGN	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN` (
+  `ID` varchar(193) NOT NULL,
+  `FOR_NAME` varchar(193) NOT NULL,
+  `REF_NAME` varchar(193) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `TYPE` int(11) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.test b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.test
new file mode 100644
index 00000000..694a7733
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
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
new file mode 100644
index 00000000..8ba0544a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
@@ -0,0 +1,8 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
+Table	Create Table
+INNODB_SYS_FOREIGN_COLS	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN_COLS` (
+  `ID` varchar(193) NOT NULL,
+  `FOR_COL_NAME` varchar(64) NOT NULL,
+  `REF_COL_NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.test b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.test
new file mode 100644
index 00000000..6afccfc2
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
new file mode 100644
index 00000000..f898e1a9
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
@@ -0,0 +1,12 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
+Table	Create Table
+INNODB_SYS_INDEXES	CREATE TEMPORARY TABLE `INNODB_SYS_INDEXES` (
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `TYPE` int(11) NOT NULL,
+  `N_FIELDS` int(11) NOT NULL,
+  `PAGE_NO` int(11),
+  `SPACE` int(11),
+  `MERGE_THRESHOLD` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.test b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.test
new file mode 100644
index 00000000..b8ad25ea
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
new file mode 100644
index 00000000..fef0c953
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
@@ -0,0 +1,24 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_SEMAPHORE_WAITS;
+Table	Create Table
+INNODB_SYS_SEMAPHORE_WAITS	CREATE TEMPORARY TABLE `INNODB_SYS_SEMAPHORE_WAITS` (
+  `THREAD_ID` bigint(21) unsigned NOT NULL,
+  `OBJECT_NAME` varchar(4000),
+  `FILE` varchar(4000),
+  `LINE` int(11) unsigned NOT NULL,
+  `WAIT_TIME` bigint(21) unsigned NOT NULL,
+  `WAIT_OBJECT` bigint(21) unsigned NOT NULL,
+  `WAIT_TYPE` varchar(16),
+  `HOLDER_THREAD_ID` bigint(21) unsigned NOT NULL,
+  `HOLDER_FILE` varchar(4000),
+  `HOLDER_LINE` int(11) unsigned NOT NULL,
+  `CREATED_FILE` varchar(4000),
+  `CREATED_LINE` int(11) unsigned NOT NULL,
+  `WRITER_THREAD` bigint(21) unsigned NOT NULL,
+  `RESERVATION_MODE` varchar(16),
+  `READERS` int(11) unsigned NOT NULL,
+  `WAITERS_FLAG` bigint(21) unsigned NOT NULL,
+  `LOCK_WORD` bigint(21) unsigned NOT NULL,
+  `LAST_WRITER_FILE` varchar(4000),
+  `LAST_WRITER_LINE` int(11) unsigned NOT NULL,
+  `OS_WAIT_COUNT` int(11) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
new file mode 100644
index 00000000..08db6edb
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
@@ -0,0 +1,12 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+Table	Create Table
+INNODB_SYS_TABLES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLES` (
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic'),
+  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL,
+  `SPACE_TYPE` enum('Single','System')
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tables.test b/mysql-test/suite/innodb_i_s/innodb_sys_tables.test
new file mode 100644
index 00000000..b868678f
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tables.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLES;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt
new file mode 100644
index 00000000..497233a1
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt
@@ -0,0 +1 @@
+--innodb_sys_tablespaces
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
new file mode 100644
index 00000000..01e655de
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
@@ -0,0 +1,13 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES;
+Table	Create Table
+INNODB_SYS_TABLESPACES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESPACES` (
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` varchar(22),
+  `PAGE_SIZE` int(11) unsigned NOT NULL,
+  `FILENAME` varchar(512) NOT NULL,
+  `FS_BLOCK_SIZE` int(11) unsigned NOT NULL,
+  `FILE_SIZE` bigint(21) unsigned NOT NULL,
+  `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.test b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.test
new file mode 100644
index 00000000..e5132dc1
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.opt b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.opt
new file mode 100644
index 00000000..370dbcef
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.opt
@@ -0,0 +1 @@
+--innodb_sys_tablestats
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
new file mode 100644
index 00000000..98b43c63
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
@@ -0,0 +1,13 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
+Table	Create Table
+INNODB_SYS_TABLESTATS	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESTATS` (
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `STATS_INITIALIZED` int(1) NOT NULL,
+  `NUM_ROWS` bigint(21) unsigned NOT NULL,
+  `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL,
+  `AUTOINC` bigint(21) unsigned NOT NULL,
+  `REF_COUNT` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.test b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.test
new file mode 100644
index 00000000..45d7e31a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
new file mode 100644
index 00000000..3736c038
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
@@ -0,0 +1,7 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL;
+Table	Create Table
+INNODB_SYS_VIRTUAL	CREATE TEMPORARY TABLE `INNODB_SYS_VIRTUAL` (
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `POS` int(11) unsigned NOT NULL,
+  `BASE_POS` int(11) unsigned NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.test b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.test
new file mode 100644
index 00000000..58577f7d
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL;
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.opt b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.opt
new file mode 100644
index 00000000..557daf9b
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.opt
@@ -0,0 +1 @@
+--innodb_tablespaces_encryption
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
new file mode 100644
index 00000000..013e4e67
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
@@ -0,0 +1,14 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION;
+Table	Create Table
+INNODB_TABLESPACES_ENCRYPTION	CREATE TEMPORARY TABLE `INNODB_TABLESPACES_ENCRYPTION` (
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655),
+  `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL,
+  `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL,
+  `MIN_KEY_VERSION` int(11) unsigned NOT NULL,
+  `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL,
+  `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned,
+  `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned,
+  `CURRENT_KEY_ID` int(11) unsigned NOT NULL,
+  `ROTATING_OR_FLUSHING` int(1) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.test b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.test
new file mode 100644
index 00000000..da361a3b
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION;
diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.result b/mysql-test/suite/innodb_i_s/innodb_trx.result
new file mode 100644
index 00000000..36a08d8a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -0,0 +1,48 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
+Table	Create Table
+INNODB_TRX	CREATE TEMPORARY TABLE `INNODB_TRX` (
+  `trx_id` bigint(21) unsigned NOT NULL,
+  `trx_state` varchar(13) NOT NULL,
+  `trx_started` datetime NOT NULL,
+  `trx_requested_lock_id` varchar(81),
+  `trx_wait_started` datetime,
+  `trx_weight` bigint(21) unsigned NOT NULL,
+  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL,
+  `trx_query` varchar(1024),
+  `trx_operation_state` varchar(64),
+  `trx_tables_in_use` bigint(21) unsigned NOT NULL,
+  `trx_tables_locked` bigint(21) unsigned NOT NULL,
+  `trx_lock_structs` bigint(21) unsigned NOT NULL,
+  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL,
+  `trx_rows_locked` bigint(21) unsigned NOT NULL,
+  `trx_rows_modified` bigint(21) unsigned NOT NULL,
+  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL,
+  `trx_isolation_level` enum('READ UNCOMMITTED','READ COMMITTED','REPEATABLE READ','SERIALIZABLE') NOT NULL,
+  `trx_unique_checks` int(1) NOT NULL,
+  `trx_foreign_key_checks` int(1) NOT NULL,
+  `trx_last_foreign_key_error` varchar(256),
+  `trx_is_read_only` int(1) NOT NULL,
+  `trx_autocommit_non_locking` int(1) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+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;
+DROP TEMPORARY TABLE t1;
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-26507 Assertion `tmp != ((long long) 0x8000000000000000LL)' failed in TIME_from_longlong_datetime_packed
+#
+CREATE ALGORITHM=TEMPTABLE VIEW i AS
+SELECT a.trx_started
+FROM INFORMATION_SCHEMA.innodb_lock_waits w
+JOIN INFORMATION_SCHEMA.innodb_trx a
+ORDER BY a.trx_wait_started;
+SET SESSION sql_mode='ALLOW_INVALID_DATES';
+SELECT * FROM i;
+SET SESSION sql_mode=DEFAULT;
+DROP VIEW i;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.test b/mysql-test/suite/innodb_i_s/innodb_trx.test
new file mode 100644
index 00000000..2a66750e
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.test
@@ -0,0 +1,34 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
+
+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;
+DROP TEMPORARY TABLE t1;
+
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-26507 Assertion `tmp != ((long long) 0x8000000000000000LL)' failed in TIME_from_longlong_datetime_packed
+--echo #
+
+CREATE ALGORITHM=TEMPTABLE VIEW i AS
+  SELECT a.trx_started
+  FROM INFORMATION_SCHEMA.innodb_lock_waits w
+  JOIN INFORMATION_SCHEMA.innodb_trx a
+  ORDER BY a.trx_wait_started;
+SET SESSION sql_mode='ALLOW_INVALID_DATES';
+--disable_result_log
+SELECT * FROM i;
+--enable_result_log
+SET SESSION sql_mode=DEFAULT;
+DROP VIEW i;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #