MDEV-15058: Revert the changes to INFORMATION_SCHEMA

For compatibility with diagnostic software, let us return a dummy buffer pool identifier 0 and restore the columns that were initially deleted in commit 1a6f708: information_schema.innodb_buffer_page.pool_id information_schema.innodb_buffer_page_lru.pool_id information_schema.innodb_buffer_pool_stats.pool_id information_schema.innodb_cmpmem.buffer_pool_instance information_schema.innodb_cmpmem_reset.buffer_pool_instance Thanks to Vladislav Vaintroub for pointing this out.
MariaDB · Feb 12, 2020 · 20a7f75 · 20a7f75
1 parent f0606a7
commit 20a7f75
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 101 deletions.
diff --git a/mysql-test/main/information_schema_all_engines.result b/mysql-test/main/information_schema_all_engines.result
@@ -99,9 +99,9 @@ GEOMETRY_COLUMNS	F_TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
 INDEX_STATISTICS	TABLE_SCHEMA
-INNODB_BUFFER_PAGE	BLOCK_ID
-INNODB_BUFFER_PAGE_LRU	LRU_POSITION
-INNODB_BUFFER_POOL_STATS	POOL_SIZE
+INNODB_BUFFER_PAGE	POOL_ID
+INNODB_BUFFER_PAGE_LRU	POOL_ID
+INNODB_BUFFER_POOL_STATS	POOL_ID
 INNODB_CMP	page_size
 INNODB_CMPMEM	page_size
 INNODB_CMPMEM_RESET	page_size
@@ -180,9 +180,9 @@ GEOMETRY_COLUMNS	F_TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
 INDEX_STATISTICS	TABLE_SCHEMA
-INNODB_BUFFER_PAGE	BLOCK_ID
-INNODB_BUFFER_PAGE_LRU	LRU_POSITION
-INNODB_BUFFER_POOL_STATS	POOL_SIZE
+INNODB_BUFFER_PAGE	POOL_ID
+INNODB_BUFFER_PAGE_LRU	POOL_ID
+INNODB_BUFFER_POOL_STATS	POOL_ID
 INNODB_CMP	page_size
 INNODB_CMPMEM	page_size
 INNODB_CMPMEM_RESET	page_size

diff --git a/mysql-test/main/sp-group.result b/mysql-test/main/sp-group.result
@@ -22,9 +22,9 @@ ORDER BY table1.NUMBER_RECORDS
 LIMIT 0
 ;
 CALL s1;
-LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK	pk	f0	f1	f2	f3	f4	f5	f6	f7	f8	f9
+POOL_ID	LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK	pk	f0	f1	f2	f3	f4	f5	f6	f7	f8	f9
 CALL s1;
-LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK	pk	f0	f1	f2	f3	f4	f5	f6	f7	f8	f9
+POOL_ID	LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK	pk	f0	f1	f2	f3	f4	f5	f6	f7	f8	f9
 drop table t1;
 drop view view_t1;
 drop procedure s1;

diff --git a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
@@ -27,11 +27,11 @@ database_name	table_name	index_name	compress_ops	compress_ops_ok	compress_time	u
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_cmp_per_index_reset but the InnoDB storage engine is not installed
 select * from information_schema.innodb_cmpmem;
-page_size	pages_used	pages_free	relocation_ops	relocation_time
+page_size	buffer_pool_instance	pages_used	pages_free	relocation_ops	relocation_time
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_cmpmem but the InnoDB storage engine is not installed
 select * from information_schema.innodb_cmpmem_reset;
-page_size	pages_used	pages_free	relocation_ops	relocation_time
+page_size	buffer_pool_instance	pages_used	pages_free	relocation_ops	relocation_time
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_cmpmem_reset but the InnoDB storage engine is not installed
 select * from information_schema.innodb_metrics;
@@ -344,11 +344,11 @@ KEY	VALUE
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_ft_config but the InnoDB storage engine is not installed
 select * from information_schema.innodb_buffer_page;
-BLOCK_ID	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	PAGE_STATE	IO_FIX	IS_OLD	FREE_PAGE_CLOCK
+POOL_ID	BLOCK_ID	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	PAGE_STATE	IO_FIX	IS_OLD	FREE_PAGE_CLOCK
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_buffer_page but the InnoDB storage engine is not installed
 select * from information_schema.innodb_buffer_page_lru;
-LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK
+POOL_ID	LRU_POSITION	SPACE	PAGE_NUMBER	PAGE_TYPE	FLUSH_TYPE	FIX_COUNT	IS_HASHED	NEWEST_MODIFICATION	OLDEST_MODIFICATION	ACCESS_TIME	TABLE_NAME	INDEX_NAME	NUMBER_RECORDS	DATA_SIZE	COMPRESSED_SIZE	COMPRESSED	IO_FIX	IS_OLD	FREE_PAGE_CLOCK
 Warnings:
 Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_buffer_page_lru but the InnoDB storage engine is not installed
 select * from information_schema.innodb_buffer_stats;

diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -1,6 +1,7 @@
 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 DEFAULT 0,
   `BLOCK_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
   `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
   `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,

diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -1,6 +1,7 @@
 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 DEFAULT 0,
   `LRU_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0,
   `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
   `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,

diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
@@ -1,6 +1,7 @@
 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 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,

diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
@@ -2,6 +2,7 @@ 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,

diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
@@ -2,6 +2,7 @@ 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,