MDEV-34571 Add page accessed and pages read from disk to table_stats

Trivial batch, using the handler statistics already collected for the slow query log. The reason for the changes in test cases was mainly to change to use select TABLE_SCHEMA ... from information_schema.table_statistics instead of 'show table_statistics' to avoid future changes to test results if we add more columns to table_statistics.

Author: montywi

mysql-test/main/information_schema_stats.result

@@ -20,15 +20,15 @@ TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 test	just_a_test	IND_just_a_test_first_name_last_name	1	1
 test	just_a_test	IND_just_a_test_state	2	1
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	just_a_test	18	5	5	5	0	0	2	0
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	just_a_test	18	5	5	5	0	0	2	00	0
 alter table just_a_test drop key IND_just_a_test_first_name_last_name;
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 test	just_a_test	IND_just_a_test_state	2	1
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	just_a_test	23	5	5	5	0	0	2	0
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	just_a_test	23	5	5	5	0	0	2	00	0
 alter table just_a_test drop column state;
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
@@ -40,18 +40,18 @@ select * from just_a_test force index(primary) where id=8;
 id	first_name	last_name	address	phone	email
 update just_a_test set first_name="unlucky" where id=5;
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	just_a_test	31	6	6	5	1	0	4	1
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	just_a_test	31	6	6	5	1	0	4	10	0
 delete from just_a_test where id=5;
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	just_a_test	32	7	7	5	1	1	5	1
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	just_a_test	32	7	7	5	1	1	5	10	0
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 test	just_a_test	PRIMARY	4	3
 drop table just_a_test;
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 create table just_a_test(id int not null primary key,first_name varchar(10),last_name varchar(10),address varchar(100),phone bigint,email varchar(30), state varchar(30),key(first_name,last_name),key(state));
@@ -75,12 +75,12 @@ test	just_a_test	PRIMARY	4	1
 test	just_a_test	first_name	1	1
 test	just_a_test	state	2	1
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	just_a_test	7	5	15	5	0	0	3	0
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	just_a_test	7	5	15	5	0	0	3	00	0
 drop table just_a_test;
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
 set global userstat=@save_userstat;
 # End of 11.5 tests

mysql-test/main/lowercase_table5.result

@@ -129,9 +129,9 @@ a
 3
 4
 SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS ORDER BY BINARY TABLE_NAME;
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
-test	T1	4	4	4	4	0	0	0	0
-test	t1	4	4	4	4	0	0	0	0
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
+test	T1	4	4	4	4	0	0	0	00	0
+test	t1	4	4	4	4	0	0	0	00	0
 SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS ORDER BY BINARY TABLE_NAME;
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 test	T1	a	4	1

mysql-test/main/subselect.result

@@ -7125,8 +7125,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/subselect.test

@@ -5954,8 +5954,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 --enable_ps2_protocol
 
 --echo # The following shows that t2 was indeed scanned with a full scan.
---sorted_result
-show table_statistics;
+--sorted_result 
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
 show index_statistics;
 set global userstat=@tmp_mdev410;
 

mysql-test/main/subselect_no_exists_to_in.result

@@ -7127,8 +7127,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/subselect_no_mat.result

@@ -7123,8 +7123,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/subselect_no_opts.result

@@ -7120,8 +7120,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/subselect_no_scache.result

@@ -7131,8 +7131,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/subselect_no_semijoin.result

@@ -7120,8 +7120,8 @@ WHERE SLEEP(0.1) OR c < 'p' OR b = ( SELECT MIN(b) FROM t2 );
 MIN(b)
 NULL
 # The following shows that t2 was indeed scanned with a full scan.
-show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+select TABLE_SCHEMA, TABLE_NAME, ROWS_READ, ROWS_CHANGED, ROWS_CHANGED_X_INDEXES, ROWS_INSERTED, ROWS_UPDATED, ROWS_DELETED, KEY_READ_HITS, KEY_READ_MISSES from information_schema.table_statistics;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
 test	t1	2	0	0	0	0	0	0	0
 test	t2	3	0	0	0	0	0	1	0
 test	t3	0	0	0	0	0	0	0	1

mysql-test/main/userstat.result

@@ -76,6 +76,8 @@ ROWS_UPDATED	bigint(21)	NO	NULL
 ROWS_DELETED	bigint(21)	NO	NULL
 KEY_READ_HITS	bigint(21)	NO	NULL
 KEY_READ_MISSES	bigint(21)	NO	NULL
+PAGES_ACCESSED	bigint(21)	NO	NULL
+PAGES_READ_FROM_DISK	bigint(21)	NO	NULL
 set @save_general_log=@@global.general_log;
 set @@global.general_log=0;
 set @@global.userstat=1;
@@ -150,9 +152,9 @@ set @@global.userstat=0;
 select * from information_schema.index_statistics;
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 select * from information_schema.table_statistics;
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
 show table_statistics;
-Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_misses
+Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes	Rows_inserted	Rows_updated	Rows_deleted	Key_read_hits	Key_read_missesPages_accessed	Pages_read_from_disk
 show index_statistics;
 Table_schema	Table_name	Index_name	Rows_read	Queries
 select TOTAL_CONNECTIONS, TOTAL_SSL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, UPDATE_COMMANDS, COMMIT_TRANSACTIONS, ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, ACCESS_DENIED, EMPTY_QUERIES from information_schema.client_statistics;;
@@ -200,7 +202,7 @@ flush index_statistics;
 select * from information_schema.index_statistics;
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ	QUERIES
 select * from information_schema.table_statistics;
-TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSES
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES	ROWS_INSERTED	ROWS_UPDATED	ROWS_DELETED	KEY_READ_HITS	KEY_READ_MISSESPAGES_ACCESSED	PAGES_READ_FROM_DISK
 show status like "%generic%";
 Variable_name	Value
 Com_show_generic	2