MDEV-6926: innodb_rows_updated is misleading on slav

Merged Facebook commit dd2d11be7aaf3be270e740fb95cbc4eacb52f4d7
authored by Rongrong Zhong from https://github.com/facebook/mysql-5.6

This fixes MySQL Bug #68220 innodb_rows_updated is misleading on slave
http://bugs.mysql.com/bug.php?id=68220

Added innodb_system_rows_read/inserted/updated/deleted counters
that are the equivalent of innodb_rows_* but that only account for
changes made to system databases (mysql, information_schame and
preformance_schema). These counters will be used on slaves to
differentiated the updates made on system databases from those made on
user databases.

innodb_rows_* status counters are not updated when innodb_system_rows_*
are updated.

https://github.com/facebook/mysql-5.6/commit/dd2d11be7aaf3be270e740fb95cbc4eacb52f4d7

1 files changed, 36 insertions, 0 deletions

diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
index 6f1c4c21d17..8c0af874228 100644
--- a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
@@ -207,6 +207,10 @@ dml_reads	disabled
 dml_inserts	disabled
 dml_deletes	disabled
 dml_updates	disabled
+dml_system_reads	disabled
+dml_system_inserts	disabled
+dml_system_deletes	disabled
+dml_system_updates	disabled
 ddl_background_drop_indexes	disabled
 ddl_background_drop_tables	disabled
 ddl_online_create_index	disabled
@@ -429,6 +433,10 @@ dml_reads	4	NULL	4	4	NULL	4	enabled
 dml_inserts	1	NULL	1	1	NULL	1	enabled
 dml_deletes	0	NULL	0	0	NULL	0	enabled
 dml_updates	2	NULL	2	2	NULL	2	enabled
+dml_system_reads	0	NULL	0	0	NULL	0	enabled
+dml_system_inserts	0	NULL	0	0	NULL	0	enabled
+dml_system_deletes	0	NULL	0	0	NULL	0	enabled
+dml_system_updates	0	NULL	0	0	NULL	0	enabled
 delete from monitor_test;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -439,6 +447,10 @@ dml_reads	6	NULL	6	6	NULL	6	enabled
 dml_inserts	1	NULL	1	1	NULL	1	enabled
 dml_deletes	2	NULL	2	2	NULL	2	enabled
 dml_updates	2	NULL	2	2	NULL	2	enabled
+dml_system_reads	0	NULL	0	0	NULL	0	enabled
+dml_system_inserts	0	NULL	0	0	NULL	0	enabled
+dml_system_deletes	0	NULL	0	0	NULL	0	enabled
+dml_system_updates	0	NULL	0	0	NULL	0	enabled
 set global innodb_monitor_reset =  module_dml;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -449,6 +461,10 @@ dml_reads	6	NULL	6	0	NULL	0	enabled
 dml_inserts	1	NULL	1	0	NULL	0	enabled
 dml_deletes	2	NULL	2	0	NULL	0	enabled
 dml_updates	2	NULL	2	0	NULL	0	enabled
+dml_system_reads	0	NULL	0	0	NULL	0	enabled
+dml_system_inserts	0	NULL	0	0	NULL	0	enabled
+dml_system_deletes	0	NULL	0	0	NULL	0	enabled
+dml_system_updates	0	NULL	0	0	NULL	0	enabled
 insert into monitor_test values(9);
 insert into monitor_test values(1);
 delete from monitor_test;
@@ -461,6 +477,10 @@ dml_reads	8	NULL	8	2	NULL	2	enabled
 dml_inserts	3	NULL	3	2	NULL	2	enabled
 dml_deletes	4	NULL	4	2	NULL	2	enabled
 dml_updates	2	NULL	2	0	NULL	0	enabled
+dml_system_reads	0	NULL	0	0	NULL	0	enabled
+dml_system_inserts	0	NULL	0	0	NULL	0	enabled
+dml_system_deletes	0	NULL	0	0	NULL	0	enabled
+dml_system_updates	0	NULL	0	0	NULL	0	enabled
 set global innodb_monitor_reset_all  =  module_dml;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -471,6 +491,10 @@ dml_reads	8	NULL	8	2	NULL	2	enabled
 dml_inserts	3	NULL	3	2	NULL	2	enabled
 dml_deletes	4	NULL	4	2	NULL	2	enabled
 dml_updates	2	NULL	2	0	NULL	0	enabled
+dml_system_reads	0	NULL	0	0	NULL	0	enabled
+dml_system_inserts	0	NULL	0	0	NULL	0	enabled
+dml_system_deletes	0	NULL	0	0	NULL	0	enabled
+dml_system_updates	0	NULL	0	0	NULL	0	enabled
 set global innodb_monitor_disable = module_dml;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -481,6 +505,10 @@ dml_reads	8	NULL	8	2	NULL	2	disabled
 dml_inserts	3	NULL	3	2	NULL	2	disabled
 dml_deletes	4	NULL	4	2	NULL	2	disabled
 dml_updates	2	NULL	2	0	NULL	0	disabled
+dml_system_reads	0	NULL	0	0	NULL	0	disabled
+dml_system_inserts	0	NULL	0	0	NULL	0	disabled
+dml_system_deletes	0	NULL	0	0	NULL	0	disabled
+dml_system_updates	0	NULL	0	0	NULL	0	disabled
 set global innodb_monitor_reset_all  = module_dml;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -491,6 +519,10 @@ dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
 dml_inserts	NULL	NULL	0	NULL	NULL	0	disabled
 dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
 dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_reads	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_inserts	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_deletes	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_updates	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_enable = dml_inserts;
 insert into monitor_test values(9);
 insert into monitor_test values(1);
@@ -504,6 +536,10 @@ dml_reads	NULL	NULL	0	NULL	NULL	0	disabled
 dml_inserts	2	NULL	2	2	NULL	2	enabled
 dml_deletes	NULL	NULL	0	NULL	NULL	0	disabled
 dml_updates	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_reads	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_inserts	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_deletes	NULL	NULL	0	NULL	NULL	0	disabled
+dml_system_updates	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_disable = module_dml;
 drop table monitor_test;
 set global innodb_monitor_enable = file_num_open_files;