diff --git a/mysql-test/suite/encryption/r/innodb-first-page-read.result b/mysql-test/suite/encryption/r/innodb-first-page-read.result deleted file mode 100644 index 29253885e83..00000000000 --- a/mysql-test/suite/encryption/r/innodb-first-page-read.result +++ /dev/null @@ -1,96 +0,0 @@ -FLUSH STATUS; -create database innodb_test; -use innodb_test; -create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; -create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact; -create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic; -create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed; -create table innodb_compressed1(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=1; -create table innodb_compressed2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=2; -create table innodb_compressed4(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=4; -create table innodb_compressed8(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=8; -create table innodb_compressed16(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=16; -create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant; -create table innodb_pagecomp(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes; -create table innodb_pagecomp1(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=1; -create table innodb_pagecomp2(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=2; -create table innodb_pagecomp3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=3; -create table innodb_pagecomp4(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=4; -create table innodb_pagecomp5(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=5; -create table innodb_pagecomp6(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=6; -create table innodb_pagecomp7(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=7; -create table innodb_pagecomp8(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=8; -create table innodb_pagecomp9(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=9; -create table innodb_datadir1(c1 bigint not null, b char(200)) engine=innodb DATA DIRECTORY='MYSQL_TMP_DIR'; -create table innodb_datadir2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed DATA DIRECTORY='MYSQL_TMP_DIR'; -create table innodb_datadir3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes DATA DIRECTORY='MYSQL_TMP_DIR'; -begin; -insert into innodb_normal values (1,'secret'); -insert into innodb_compact select * from innodb_normal; -insert into innodb_dynamic select * from innodb_normal; -insert into innodb_compressed select * from innodb_normal; -insert into innodb_compressed1 select * from innodb_normal; -insert into innodb_compressed2 select * from innodb_normal; -insert into innodb_compressed4 select * from innodb_normal; -insert into innodb_compressed8 select * from innodb_normal; -insert into innodb_compressed16 select * from innodb_normal; -insert into innodb_redundant select * from innodb_normal; -insert into innodb_pagecomp select * from innodb_normal; -insert into innodb_pagecomp1 select * from innodb_normal; -insert into innodb_pagecomp2 select * from innodb_normal; -insert into innodb_pagecomp3 select * from innodb_normal; -insert into innodb_pagecomp4 select * from innodb_normal; -insert into innodb_pagecomp5 select * from innodb_normal; -insert into innodb_pagecomp6 select * from innodb_normal; -insert into innodb_pagecomp7 select * from innodb_normal; -insert into innodb_pagecomp8 select * from innodb_normal; -insert into innodb_pagecomp9 select * from innodb_normal; -insert into innodb_datadir1 select * from innodb_normal; -insert into innodb_datadir2 select * from innodb_normal; -insert into innodb_datadir3 select * from innodb_normal; -commit; -FLUSH STATUS; -# Restart server and see how many page 0's are read -# result should actual number of tables except remote tables could be read twice -# i.e. < 23 + 3*2 = 29 -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -set global innodb_encrypt_tables=OFF; -# wait until tables are decrypted -# result should be actual number of tables except remote tables could be read twice -# i.e. < 23 + 3*2 = 29 -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -FLUSH STATUS; -# restart and see number read page 0 -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -VARIABLE_VALUE <= 29 -1 -drop database innodb_test; -FLUSH STATUS; diff --git a/mysql-test/suite/encryption/r/innodb_lotoftables.result b/mysql-test/suite/encryption/r/innodb_lotoftables.result index 45800c8cd0b..3de38dc59ea 100644 --- a/mysql-test/suite/encryption/r/innodb_lotoftables.result +++ b/mysql-test/suite/encryption/r/innodb_lotoftables.result @@ -8,29 +8,17 @@ innodb_encryption_rotation_iops 100 innodb_encryption_threads 0 create database innodb_encrypted_1; use innodb_encrypted_1; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 set autocommit=0; set autocommit=1; commit work; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 # should be empty SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIKE 'innodb_encrypted%'; NAME create database innodb_encrypted_2; use innodb_encrypted_2; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 set autocommit=0; commit work; set autocommit=1; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 # should contain 100 tables SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; NAME @@ -139,15 +127,9 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ NAME create database innodb_encrypted_3; use innodb_encrypted_3; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 set autocommit=0; commit work; set autocommit=1; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 # should contain 100 tables SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; NAME @@ -355,9 +337,6 @@ innodb_encrypted_3/t_97 innodb_encrypted_3/t_98 innodb_encrypted_3/t_99 use test; -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; NAME innodb_encrypted_2/t_1 @@ -768,43 +747,12 @@ innodb_encrypted_3/t_96 innodb_encrypted_3/t_97 innodb_encrypted_3/t_98 innodb_encrypted_3/t_99 -show status like 'innodb_pages0_read%'; -Variable_name Value -Innodb_pages0_read 4 # Success! # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 # Restart Success! -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 -use test; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 use innodb_encrypted_1; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 use innodb_encrypted_2; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 use innodb_encrypted_3; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 -use innodb_encrypted_1; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 -use innodb_encrypted_2; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 -use innodb_encrypted_3; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -variable_value <= 303 -1 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; NAME innodb_encrypted_3/t_1 diff --git a/mysql-test/suite/encryption/t/innodb-first-page-read.test b/mysql-test/suite/encryption/t/innodb-first-page-read.test deleted file mode 100644 index c86e16c52b8..00000000000 --- a/mysql-test/suite/encryption/t/innodb-first-page-read.test +++ /dev/null @@ -1,104 +0,0 @@ --- source include/have_innodb.inc --- source include/have_file_key_management_plugin.inc --- source include/not_embedded.inc - -FLUSH STATUS; - -create database innodb_test; -use innodb_test; -create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; -create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact; -create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic; -create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed; -create table innodb_compressed1(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=1; -create table innodb_compressed2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=2; -create table innodb_compressed4(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=4; -create table innodb_compressed8(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=8; -create table innodb_compressed16(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=16; -create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant; -create table innodb_pagecomp(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes; -create table innodb_pagecomp1(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=1; -create table innodb_pagecomp2(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=2; -create table innodb_pagecomp3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=3; -create table innodb_pagecomp4(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=4; -create table innodb_pagecomp5(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=5; -create table innodb_pagecomp6(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=6; -create table innodb_pagecomp7(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=7; -create table innodb_pagecomp8(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=8; -create table innodb_pagecomp9(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=9; - ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -eval create table innodb_datadir1(c1 bigint not null, b char(200)) engine=innodb DATA DIRECTORY='$MYSQL_TMP_DIR'; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -eval create table innodb_datadir2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed DATA DIRECTORY='$MYSQL_TMP_DIR'; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -eval create table innodb_datadir3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes DATA DIRECTORY='$MYSQL_TMP_DIR'; - -begin; -insert into innodb_normal values (1,'secret'); -insert into innodb_compact select * from innodb_normal; -insert into innodb_dynamic select * from innodb_normal; -insert into innodb_compressed select * from innodb_normal; -insert into innodb_compressed1 select * from innodb_normal; -insert into innodb_compressed2 select * from innodb_normal; -insert into innodb_compressed4 select * from innodb_normal; -insert into innodb_compressed8 select * from innodb_normal; -insert into innodb_compressed16 select * from innodb_normal; -insert into innodb_redundant select * from innodb_normal; -insert into innodb_pagecomp select * from innodb_normal; -insert into innodb_pagecomp1 select * from innodb_normal; -insert into innodb_pagecomp2 select * from innodb_normal; -insert into innodb_pagecomp3 select * from innodb_normal; -insert into innodb_pagecomp4 select * from innodb_normal; -insert into innodb_pagecomp5 select * from innodb_normal; -insert into innodb_pagecomp6 select * from innodb_normal; -insert into innodb_pagecomp7 select * from innodb_normal; -insert into innodb_pagecomp8 select * from innodb_normal; -insert into innodb_pagecomp9 select * from innodb_normal; -insert into innodb_datadir1 select * from innodb_normal; -insert into innodb_datadir2 select * from innodb_normal; -insert into innodb_datadir3 select * from innodb_normal; -commit; - -FLUSH STATUS; - ---echo # Restart server and see how many page 0's are read ---source include/restart_mysqld.inc - ---echo # result should actual number of tables except remote tables could be read twice ---echo # i.e. < 23 + 3*2 = 29 - -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; - -set global innodb_encrypt_tables=OFF; - ---echo # wait until tables are decrypted ---let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 ---source include/wait_condition.inc - ---echo # result should be actual number of tables except remote tables could be read twice ---echo # i.e. < 23 + 3*2 = 29 - -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; - -FLUSH STATUS; - ---echo # restart and see number read page 0 --- source include/restart_mysqld.inc - -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use innodb_test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; -use test; -SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; - -drop database innodb_test; -FLUSH STATUS; diff --git a/mysql-test/suite/encryption/t/innodb_lotoftables.test b/mysql-test/suite/encryption/t/innodb_lotoftables.test index 4ccdc7d5c49..413fc8685f2 100644 --- a/mysql-test/suite/encryption/t/innodb_lotoftables.test +++ b/mysql-test/suite/encryption/t/innodb_lotoftables.test @@ -21,7 +21,6 @@ SHOW VARIABLES LIKE 'innodb_encrypt%'; # create database innodb_encrypted_1; use innodb_encrypted_1; -show status like 'innodb_pages0_read%'; set autocommit=0; let $tables = 100; @@ -44,7 +43,6 @@ while ($tables) set autocommit=1; commit work; -show status like 'innodb_pages0_read%'; # # Verify # @@ -56,7 +54,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIK # create database innodb_encrypted_2; use innodb_encrypted_2; -show status like 'innodb_pages0_read%'; set autocommit=0; --disable_query_log @@ -79,7 +76,6 @@ while ($tables) commit work; set autocommit=1; -show status like 'innodb_pages0_read%'; # # Verify # @@ -93,7 +89,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ # create database innodb_encrypted_3; use innodb_encrypted_3; -show status like 'innodb_pages0_read%'; set autocommit=0; --disable_query_log @@ -116,7 +111,6 @@ while ($tables) commit work; set autocommit=1; -show status like 'innodb_pages0_read%'; # # Verify # @@ -126,7 +120,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; use test; -show status like 'innodb_pages0_read%'; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; @@ -140,7 +133,6 @@ SET GLOBAL innodb_encryption_threads=4; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; -show status like 'innodb_pages0_read%'; --echo # Success! --echo # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 @@ -149,16 +141,6 @@ show status like 'innodb_pages0_read%'; --echo # Restart Success! -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -use test; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -use innodb_encrypted_1; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -use innodb_encrypted_2; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; -use innodb_encrypted_3; -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; - use innodb_encrypted_1; --disable_result_log @@ -172,8 +154,6 @@ while ($tables) --enable_query_log --enable_result_log -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; - use innodb_encrypted_2; --disable_result_log @@ -187,8 +167,6 @@ while ($tables) --enable_query_log --enable_result_log -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; - use innodb_encrypted_3; --disable_result_log @@ -202,8 +180,6 @@ while ($tables) --enable_query_log --enable_result_log -SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read'; - SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; 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 index 79f0e73e745..2e9f0f0ee21 100644 --- a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result +++ b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result @@ -74,7 +74,6 @@ buffer_pages_written buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NUL buffer_index_pages_written buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of index pages written (innodb_index_pages_written) buffer_non_index_pages_written buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of non index pages written (innodb_non_index_pages_written) buffer_pages_read buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of pages read (innodb_pages_read) -buffer_pages0_read buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of page 0 read (innodb_pages0_read) buffer_index_sec_rec_cluster_reads buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of secondary record reads triggered cluster read buffer_index_sec_rec_cluster_reads_avoided buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Number of secondary record reads avoided triggering cluster read buffer_data_reads buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled status_counter Amount of data read in bytes (innodb_data_reads) diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result index 2700479e7f7..f5c1070ff94 100644 --- a/mysql-test/suite/innodb/r/monitor.result +++ b/mysql-test/suite/innodb/r/monitor.result @@ -39,7 +39,6 @@ buffer_pages_written disabled buffer_index_pages_written disabled buffer_non_index_pages_written disabled buffer_pages_read disabled -buffer_pages0_read disabled buffer_index_sec_rec_cluster_reads disabled buffer_index_sec_rec_cluster_reads_avoided disabled buffer_data_reads disabled diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index e9fbc2545e3..6cf30856117 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -610,7 +610,6 @@ retry: success = os_file_read( request, node->handle, page, 0, psize); - srv_stats.page0_read.add(1); const ulint space_id = fsp_header_get_space_id(page); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index d3857918c1c..eaa9900e0ec 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1010,8 +1010,6 @@ static SHOW_VAR innodb_status_variables[]= { (char*) &export_vars.innodb_pages_created, SHOW_LONG}, {"pages_read", (char*) &export_vars.innodb_pages_read, SHOW_LONG}, - {"pages0_read", - (char*) &export_vars.innodb_page0_read, SHOW_LONG}, {"pages_written", (char*) &export_vars.innodb_pages_written, SHOW_LONG}, {"row_lock_current_waits", diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h index b91f7c1103b..a0230575526 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -177,7 +177,6 @@ enum monitor_id_t { MONITOR_OVLD_INDEX_PAGES_WRITTEN, MONITOR_OVLD_NON_INDEX_PAGES_WRITTEN, MONITOR_OVLD_PAGES_READ, - MONITOR_OVLD_PAGES0_READ, MONITOR_OVLD_INDEX_SEC_REC_CLUSTER_READS, MONITOR_OVLD_INDEX_SEC_REC_CLUSTER_READS_AVOIDED, MONITOR_OVLD_BYTE_READ, diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index d16d7c94a8b..bd1452a3002 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -180,9 +180,6 @@ struct srv_stats_t /** Number of times prefix optimization avoided triggering cluster lookup */ ulint_ctr_64_t n_sec_rec_cluster_reads_avoided; - /** Number of times page 0 is read from tablespace */ - ulint_ctr_64_t page0_read; - /** Number of encryption_get_latest_key_version calls */ ulint_ctr_64_t n_key_requests; @@ -980,7 +977,6 @@ struct export_var_t{ ulint innodb_page_size; /*!< UNIV_PAGE_SIZE */ ulint innodb_pages_created; /*!< buf_pool->stat.n_pages_created */ ulint innodb_pages_read; /*!< buf_pool->stat.n_pages_read*/ - ulint innodb_page0_read; /*!< srv_stats.page0_read */ ulint innodb_pages_written; /*!< buf_pool->stat.n_pages_written */ ulint innodb_row_lock_waits; /*!< srv_n_lock_wait_count */ ulint innodb_row_lock_current_waits; /*!< srv_n_lock_wait_current_count */ diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc index 569e476969f..e51b948e6d9 100644 --- a/storage/innobase/srv/srv0mon.cc +++ b/storage/innobase/srv/srv0mon.cc @@ -298,12 +298,6 @@ static monitor_info_t innodb_counter_info[] = MONITOR_EXISTING | MONITOR_DEFAULT_ON), MONITOR_DEFAULT_START, MONITOR_OVLD_PAGES_READ}, - {"buffer_pages0_read", "buffer", - "Number of page 0 read (innodb_pages0_read)", - static_cast( - MONITOR_EXISTING | MONITOR_DEFAULT_ON), - MONITOR_DEFAULT_START, MONITOR_OVLD_PAGES0_READ}, - {"buffer_index_sec_rec_cluster_reads", "buffer", "Number of secondary record reads triggered cluster read", static_cast( @@ -1745,11 +1739,6 @@ srv_mon_process_existing_counter( value = stat.n_pages_read; break; - /* innodb_pages0_read */ - case MONITOR_OVLD_PAGES0_READ: - value = srv_stats.page0_read; - break; - /* Number of times secondary index lookup triggered cluster lookup */ case MONITOR_OVLD_INDEX_SEC_REC_CLUSTER_READS: value = srv_stats.n_sec_rec_cluster_reads; diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index c7fac33bd79..d83e2276a58 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -1562,7 +1562,6 @@ srv_export_innodb_status(void) export_vars.innodb_pages_created = stat.n_pages_created; export_vars.innodb_pages_read = stat.n_pages_read; - export_vars.innodb_page0_read = srv_stats.page0_read; export_vars.innodb_pages_written = stat.n_pages_written;