summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_page.result24
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_page.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result24
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result36
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result12
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_per_index.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result12
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_reset.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_reset.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmp_reset.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmpmem.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmpmem.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result5
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_config.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_config.result6
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_config.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result5
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_deleted.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_deleted.result5
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_deleted.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_cache.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_cache.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_table.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_table.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_ft_index_table.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_lock_waits.result8
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_lock_waits.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_locks.result14
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_locks.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_metrics.result21
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_metrics.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_mutexes.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_mutexes.result8
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_mutexes.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_columns.result10
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_columns.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result6
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_fields.result7
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_fields.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_foreign.result9
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_foreign.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result8
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_indexes.result12
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_indexes.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result24
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tables.result12
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tables.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result14
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablestats.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result13
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_tablestats.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_virtual.result7
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_sys_virtual.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result14
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.opt1
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.result13
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.test3
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_trx.result26
-rw-r--r--mysql-test/suite/innodb_i_s/innodb_trx.test3
84 files changed, 532 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9f841387c24..8c9515dbb49 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -185,6 +185,7 @@ my @DEFAULT_SUITES= qw(
innodb-
innodb_fts-
innodb_gis-
+ innodb_i_s-
innodb_zip-
json-
maria-
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 00000000000..52de51be179
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -0,0 +1,24 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
+Table Create Table
+INNODB_BUFFER_PAGE CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE` (
+ `POOL_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `BLOCK_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `SPACE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGE_NUMBER` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGE_TYPE` varchar(64) DEFAULT NULL,
+ `FLUSH_TYPE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `FIX_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `IS_HASHED` varchar(3) DEFAULT NULL,
+ `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `TABLE_NAME` varchar(1024) DEFAULT NULL,
+ `INDEX_NAME` varchar(1024) DEFAULT NULL,
+ `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGE_STATE` varchar(64) DEFAULT NULL,
+ `IO_FIX` varchar(64) DEFAULT NULL,
+ `IS_OLD` varchar(3) DEFAULT NULL,
+ `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..baf8571bc20
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
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 00000000000..970c21fc04b
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -0,0 +1,24 @@
+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` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `LRU_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `SPACE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGE_NUMBER` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGE_TYPE` varchar(64) DEFAULT NULL,
+ `FLUSH_TYPE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `FIX_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `IS_HASHED` varchar(3) DEFAULT NULL,
+ `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `TABLE_NAME` varchar(1024) DEFAULT NULL,
+ `INDEX_NAME` varchar(1024) DEFAULT NULL,
+ `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `COMPRESSED` varchar(3) DEFAULT NULL,
+ `IO_FIX` varchar(64) DEFAULT NULL,
+ `IS_OLD` varchar(3) DEFAULT NULL,
+ `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..f7969fcc2d3
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
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 00000000000..bcc395f6164
--- /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` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `POOL_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `FREE_BUFFERS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PENDING_READS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGES_MADE_YOUNG_RATE` float NOT NULL DEFAULT 0,
+ `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL DEFAULT 0,
+ `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `PAGES_READ_RATE` float NOT NULL DEFAULT 0,
+ `PAGES_CREATE_RATE` float NOT NULL DEFAULT 0,
+ `PAGES_WRITTEN_RATE` float NOT NULL DEFAULT 0,
+ `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `HIT_RATE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `READ_AHEAD_RATE` float NOT NULL DEFAULT 0,
+ `READ_AHEAD_EVICTED_RATE` float NOT NULL DEFAULT 0,
+ `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `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
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 00000000000..4dd396ef9fc
--- /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 00000000000..4f9fa4186cc
--- /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 00000000000..47a92e42e59
--- /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 DEFAULT 0,
+ `compress_ops` int(11) NOT NULL DEFAULT 0,
+ `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..a7ddff3ee85
--- /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 00000000000..561ef4d83f2
--- /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(192) NOT NULL DEFAULT '',
+ `table_name` varchar(192) NOT NULL DEFAULT '',
+ `index_name` varchar(192) NOT NULL DEFAULT '',
+ `compress_ops` int(11) NOT NULL DEFAULT 0,
+ `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..9e91e8dd934
--- /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 00000000000..37aab727b87
--- /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 00000000000..c426bf7f600
--- /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(192) NOT NULL DEFAULT '',
+ `table_name` varchar(192) NOT NULL DEFAULT '',
+ `index_name` varchar(192) NOT NULL DEFAULT '',
+ `compress_ops` int(11) NOT NULL DEFAULT 0,
+ `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..05220afe596
--- /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 00000000000..01508468386
--- /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 00000000000..3d247f2cbc1
--- /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 DEFAULT 0,
+ `compress_ops` int(11) NOT NULL DEFAULT 0,
+ `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..fe0d7196617
--- /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 00000000000..e1dd5d0a314
--- /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 DEFAULT 0,
+ `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
+ `pages_used` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..6b5ddf9b93a
--- /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 00000000000..de3b60d9218
--- /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 00000000000..178cd244f9a
--- /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 DEFAULT 0,
+ `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
+ `pages_used` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..9ea5bdf51fa
--- /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 00000000000..9665b7c5772
--- /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 00000000000..920ec782ac5
--- /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 DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..cfe2836f224
--- /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 00000000000..9e0e66f6620
--- /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 00000000000..dcb11b1805c
--- /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 DEFAULT '',
+ `VALUE` varchar(193) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..9d844250764
--- /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 00000000000..2732f3a46a5
--- /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 00000000000..c680665a256
--- /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 DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..b997c3891b0
--- /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 00000000000..011d5a78f69
--- /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 00000000000..ab1a816eee8
--- /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 DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..63b2eede818
--- /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 00000000000..a076db4e5b8
--- /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 00000000000..b95cb1ddf28
--- /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 DEFAULT '',
+ `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `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
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 00000000000..5e95dd05e98
--- /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 00000000000..ab47d299659
--- /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 00000000000..0003e7d6741
--- /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 DEFAULT '',
+ `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `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
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 00000000000..984665f2fd6
--- /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 00000000000..b6521d30fdf
--- /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` varchar(18) NOT NULL DEFAULT '',
+ `requested_lock_id` varchar(81) NOT NULL DEFAULT '',
+ `blocking_trx_id` varchar(18) NOT NULL DEFAULT '',
+ `blocking_lock_id` varchar(81) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..704537f83ae
--- /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 00000000000..38737f26537
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.result
@@ -0,0 +1,14 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
+Table Create Table
+INNODB_LOCKS CREATE TEMPORARY TABLE `INNODB_LOCKS` (
+ `lock_id` varchar(81) NOT NULL DEFAULT '',
+ `lock_trx_id` varchar(18) NOT NULL DEFAULT '',
+ `lock_mode` varchar(32) NOT NULL DEFAULT '',
+ `lock_type` varchar(32) NOT NULL DEFAULT '',
+ `lock_table` varchar(1024) NOT NULL DEFAULT '',
+ `lock_index` varchar(1024) DEFAULT NULL,
+ `lock_space` bigint(21) unsigned DEFAULT NULL,
+ `lock_page` bigint(21) unsigned DEFAULT NULL,
+ `lock_rec` bigint(21) unsigned DEFAULT NULL,
+ `lock_data` varchar(8192) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..adf45ba4642
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
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 00000000000..5f299a13a10
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.result
@@ -0,0 +1,21 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
+Table Create Table
+INNODB_METRICS CREATE TEMPORARY TABLE `INNODB_METRICS` (
+ `NAME` varchar(193) NOT NULL DEFAULT '',
+ `SUBSYSTEM` varchar(193) NOT NULL DEFAULT '',
+ `COUNT` bigint(21) NOT NULL DEFAULT 0,
+ `MAX_COUNT` bigint(21) DEFAULT NULL,
+ `MIN_COUNT` bigint(21) DEFAULT NULL,
+ `AVG_COUNT` float DEFAULT NULL,
+ `COUNT_RESET` bigint(21) NOT NULL DEFAULT 0,
+ `MAX_COUNT_RESET` bigint(21) DEFAULT NULL,
+ `MIN_COUNT_RESET` bigint(21) DEFAULT NULL,
+ `AVG_COUNT_RESET` float DEFAULT NULL,
+ `TIME_ENABLED` datetime DEFAULT NULL,
+ `TIME_DISABLED` datetime DEFAULT NULL,
+ `TIME_ELAPSED` bigint(21) DEFAULT NULL,
+ `TIME_RESET` datetime DEFAULT NULL,
+ `STATUS` varchar(193) NOT NULL DEFAULT '',
+ `TYPE` varchar(193) NOT NULL DEFAULT '',
+ `COMMENT` varchar(193) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..6a2b2cee247
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
diff --git a/mysql-test/suite/innodb_i_s/innodb_mutexes.opt b/mysql-test/suite/innodb_i_s/innodb_mutexes.opt
new file mode 100644
index 00000000000..d658e54eff5
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_mutexes.opt
@@ -0,0 +1 @@
+--innodb_mutexes
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 00000000000..e00b68d39fc
--- /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 DEFAULT '',
+ `CREATE_FILE` varchar(4000) NOT NULL DEFAULT '',
+ `CREATE_LINE` int(11) unsigned NOT NULL DEFAULT 0,
+ `OS_WAITS` bigint(21) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_mutexes.test b/mysql-test/suite/innodb_i_s/innodb_mutexes.test
new file mode 100644
index 00000000000..d4c8d49bab4
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_mutexes.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_MUTEXES;
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 00000000000..7c2f82c1c22
--- /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 DEFAULT 0,
+ `NAME` varchar(193) NOT NULL DEFAULT '',
+ `POS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `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
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 00000000000..73332697d7b
--- /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.opt b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt
new file mode 100644
index 00000000000..d6803d5ecdf
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt
@@ -0,0 +1 @@
+--innodb_sys_datafiles
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 00000000000..eb2dd8b71ad
--- /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 DEFAULT 0,
+ `PATH` varchar(4000) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test
new file mode 100644
index 00000000000..dd843fec761
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_DATAFILES;
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 00000000000..a6ee7295f3b
--- /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 DEFAULT 0,
+ `NAME` varchar(193) NOT NULL DEFAULT '',
+ `POS` int(11) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..1559eb39576
--- /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 00000000000..8dc7cbb2c53
--- /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 DEFAULT '',
+ `FOR_NAME` varchar(193) NOT NULL DEFAULT '',
+ `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
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 00000000000..694a773392e
--- /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 00000000000..7faaac7c2f4
--- /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 DEFAULT '',
+ `FOR_COL_NAME` varchar(193) NOT NULL DEFAULT '',
+ `REF_COL_NAME` varchar(193) NOT NULL DEFAULT '',
+ `POS` int(11) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..6afccfc212f
--- /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 00000000000..4bcb08037e8
--- /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 DEFAULT 0,
+ `NAME` varchar(193) NOT NULL DEFAULT '',
+ `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `TYPE` int(11) NOT NULL DEFAULT 0,
+ `N_FIELDS` int(11) NOT NULL DEFAULT 0,
+ `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
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 00000000000..b8ad25ea6e3
--- /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.opt b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.opt
new file mode 100644
index 00000000000..2b4bd0c33da
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.opt
@@ -0,0 +1 @@
+--innodb_sys_semaphore_waits
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 00000000000..ee1e3fade1e
--- /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 DEFAULT 0,
+ `OBJECT_NAME` varchar(4000) DEFAULT NULL,
+ `FILE` varchar(4000) DEFAULT NULL,
+ `LINE` int(11) unsigned NOT NULL DEFAULT 0,
+ `WAIT_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `WAIT_OBJECT` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `WAIT_TYPE` varchar(16) DEFAULT NULL,
+ `HOLDER_THREAD_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `HOLDER_FILE` varchar(4000) DEFAULT NULL,
+ `HOLDER_LINE` int(11) unsigned NOT NULL DEFAULT 0,
+ `CREATED_FILE` varchar(4000) DEFAULT NULL,
+ `CREATED_LINE` int(11) unsigned NOT NULL DEFAULT 0,
+ `WRITER_THREAD` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `RESERVATION_MODE` varchar(16) DEFAULT NULL,
+ `READERS` int(11) unsigned NOT NULL DEFAULT 0,
+ `WAITERS_FLAG` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `LOCK_WORD` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `LAST_WRITER_FILE` varchar(4000) DEFAULT NULL,
+ `LAST_WRITER_LINE` int(11) unsigned NOT NULL DEFAULT 0,
+ `OS_WAIT_COUNT` int(11) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.test b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.test
new file mode 100644
index 00000000000..a8ea1c59bb8
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_SEMAPHORE_WAITS;
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 00000000000..ec80024bddc
--- /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 DEFAULT 0,
+ `NAME` varchar(655) NOT NULL DEFAULT '',
+ `FLAG` int(11) NOT NULL DEFAULT 0,
+ `N_COLS` int(11) NOT NULL DEFAULT 0,
+ `SPACE` int(11) NOT NULL DEFAULT 0,
+ `ROW_FORMAT` varchar(12) DEFAULT NULL,
+ `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
+ `SPACE_TYPE` varchar(10) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..b868678f7f1
--- /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 00000000000..497233a1520
--- /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 00000000000..09d2d3ea091
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
@@ -0,0 +1,14 @@
+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 DEFAULT 0,
+ `NAME` varchar(655) NOT NULL DEFAULT '',
+ `FLAG` int(11) unsigned NOT NULL DEFAULT 0,
+ `ROW_FORMAT` varchar(22) DEFAULT NULL,
+ `PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
+ `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
+ `SPACE_TYPE` varchar(10) DEFAULT NULL,
+ `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
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 00000000000..e5132dc1ac0
--- /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 00000000000..370dbcef0a2
--- /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 00000000000..e5806902f12
--- /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 DEFAULT 0,
+ `NAME` varchar(193) NOT NULL DEFAULT '',
+ `STATS_INITIALIZED` varchar(193) NOT NULL DEFAULT '',
+ `NUM_ROWS` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `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
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 00000000000..45d7e31a4a9
--- /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 00000000000..0d324a13bc6
--- /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 DEFAULT 0,
+ `POS` int(11) unsigned NOT NULL DEFAULT 0,
+ `BASE_POS` int(11) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..58577f7df87
--- /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 00000000000..557daf9b0b9
--- /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 00000000000..97842c41040
--- /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 DEFAULT 0,
+ `NAME` varchar(655) DEFAULT NULL,
+ `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL DEFAULT 0,
+ `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL DEFAULT 0,
+ `MIN_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
+ `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
+ `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
+ `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) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
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 00000000000..da361a3b71d
--- /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_tablespaces_scrubbing.opt b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.opt
new file mode 100644
index 00000000000..e7999f9d727
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.opt
@@ -0,0 +1 @@
+--innodb_tablespaces_scrubbing
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.result
new file mode 100644
index 00000000000..fb28253a2bb
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.result
@@ -0,0 +1,13 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_SCRUBBING;
+Table Create Table
+INNODB_TABLESPACES_SCRUBBING CREATE TEMPORARY TABLE `INNODB_TABLESPACES_SCRUBBING` (
+ `SPACE` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `NAME` varchar(655) DEFAULT NULL,
+ `COMPRESSED` int(1) unsigned NOT NULL DEFAULT 0,
+ `LAST_SCRUB_COMPLETED` datetime DEFAULT NULL,
+ `CURRENT_SCRUB_STARTED` datetime DEFAULT NULL,
+ `CURRENT_SCRUB_ACTIVE_THREADS` int(11) unsigned DEFAULT NULL,
+ `CURRENT_SCRUB_PAGE_NUMBER` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `CURRENT_SCRUB_MAX_PAGE_NUMBER` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `ON_SSD` int(1) unsigned NOT NULL DEFAULT 0
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.test b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.test
new file mode 100644
index 00000000000..289e1ad9d20
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_SCRUBBING;
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 00000000000..d8134adad18
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -0,0 +1,26 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
+Table Create Table
+INNODB_TRX CREATE TEMPORARY TABLE `INNODB_TRX` (
+ `trx_id` varchar(18) NOT NULL DEFAULT '',
+ `trx_state` varchar(13) NOT NULL DEFAULT '',
+ `trx_started` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `trx_requested_lock_id` varchar(81) DEFAULT NULL,
+ `trx_wait_started` datetime DEFAULT NULL,
+ `trx_weight` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_mysql_thread_id` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_query` varchar(1024) DEFAULT NULL,
+ `trx_operation_state` varchar(64) DEFAULT NULL,
+ `trx_tables_in_use` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_tables_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_lock_structs` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_rows_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_rows_modified` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_concurrency_tickets` bigint(21) unsigned NOT NULL DEFAULT 0,
+ `trx_isolation_level` varchar(16) NOT NULL DEFAULT '',
+ `trx_unique_checks` int(1) NOT NULL DEFAULT 0,
+ `trx_foreign_key_checks` int(1) NOT NULL DEFAULT 0,
+ `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
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 00000000000..01bb141777e
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.test
@@ -0,0 +1,3 @@
+--source include/have_innodb.inc
+
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;