MDEV-19810 Reuse new I_S table definition helper classes for InnoDB

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-

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

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;

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_cmp.opt

@@ -0,0 +1 @@
+--innodb_cmp

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.opt

@@ -0,0 +1 @@
+--innodb_cmp_per_index_reset

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

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;

mysql-test/suite/innodb_i_s/innodb_cmp_reset.opt

@@ -0,0 +1 @@
+--innodb_cmp_reset

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.opt

@@ -0,0 +1 @@
+--innodb_cmpmem_reset

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.opt

@@ -0,0 +1 @@
+--innodb_ft_being_deleted

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_config.opt

@@ -0,0 +1 @@
+--innodb_ft_config

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.opt

@@ -0,0 +1 @@
+--innodb_ft_default_stopword

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_deleted.opt

@@ -0,0 +1 @@
+--innodb_ft_deleted

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_index_cache.opt

@@ -0,0 +1 @@
+--innodb_ft_index_cache

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

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;

mysql-test/suite/innodb_i_s/innodb_ft_index_table.opt

@@ -0,0 +1 @@
+--innodb_ft_index_table

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

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;

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

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;

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_mutexes.opt

@@ -0,0 +1 @@
+--innodb_mutexes

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt

@@ -0,0 +1 @@
+--innodb_sys_datafiles

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

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;

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

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;

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

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;

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.opt

@@ -0,0 +1 @@
+--innodb_sys_semaphore_waits

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt

@@ -0,0 +1 @@
+--innodb_sys_tablespaces

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

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;

mysql-test/suite/innodb_i_s/innodb_sys_tablestats.opt

@@ -0,0 +1 @@
+--innodb_sys_tablestats

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

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;

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

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;

mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.opt

@@ -0,0 +1 @@
+--innodb_tablespaces_encryption

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

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;

mysql-test/suite/innodb_i_s/innodb_tablespaces_scrubbing.opt

@@ -0,0 +1 @@
+--innodb_tablespaces_scrubbing

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

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;

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

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;

sql/sql_i_s.h

@@ -257,6 +257,13 @@ public:
 };
 
 
+class Float: public Type
+{
+public:
+  Float(uint length) :Type(MYSQL_TYPE_FLOAT, length, false) { }
+};
+
+
 
 class Column: public ST_FIELD_INFO
 {