Merge branch 'mysql-5.6' into mysql-5.7

Author: Darshan M N

mysql-test/suite/innodb/r/monitor.result

@@ -572,76 +572,48 @@ set global innodb_monitor_reset_all = default;
 # Bug#22576241 SETTING INNODB_MONITOR_ENABLE TO ALL DOES NOT ENABLE ALL
 # MONITORS
 #
-SET GLOBAL innodb_fast_shutdown = 0;
-# restart
-SET GLOBAL innodb_purge_stop_now=ON;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
 buffer_page_written_index_leaf	0
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	0
 SET GLOBAL innodb_monitor_enable='module_buffer_page';
 INSERT INTO t1 VALUES (1), (2), (3), (4);
 FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
-buffer_page_written_index_leaf	1
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	1
+buffer_page_written_index_leaf	NNNN
 SET GLOBAL innodb_monitor_disable='module_buffer_page';
 SET GLOBAL innodb_monitor_reset_all='module_buffer_page';
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
 buffer_page_written_index_leaf	0
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	0
 SET GLOBAL innodb_monitor_enable='%';
 INSERT INTO t1 VALUES (5), (6), (7), (8);
 FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
-buffer_page_written_index_leaf	1
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	0
+buffer_page_written_index_leaf	NNNN
 SET GLOBAL innodb_monitor_disable='%';
 SET GLOBAL innodb_monitor_reset_all='%';
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
 buffer_page_written_index_leaf	0
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	0
 SET GLOBAL innodb_monitor_enable='ALL';
 INSERT INTO t1 VALUES (9), (10), (11), (12);
 FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 NAME	COUNT
-buffer_page_written_index_leaf	1
-buffer_page_written_index_non_leaf	0
-buffer_page_written_index_ibuf_leaf	0
-buffer_page_written_index_ibuf_non_leaf	0
-buffer_page_written_index_inode	0
+buffer_page_written_index_leaf	NNNN
 SET GLOBAL innodb_monitor_enable=default;
 SET GLOBAL innodb_monitor_disable=default;
 SET GLOBAL innodb_monitor_reset_all=default;
 DROP TABLE t1;
-SET GLOBAL innodb_purge_run_now = ON;

mysql-test/suite/innodb/t/monitor.test

@@ -390,46 +390,46 @@ set global innodb_monitor_reset_all = default;
 --echo # Bug#22576241 SETTING INNODB_MONITOR_ENABLE TO ALL DOES NOT ENABLE ALL
 --echo # MONITORS
 --echo #
-# Slow shutdown and restart to make sure ibuf merge is finished
-SET GLOBAL innodb_fast_shutdown = 0;
---source include/restart_mysqld.inc
-
-SET GLOBAL innodb_purge_stop_now=ON;
-
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
 
 let $innodb_monitor_enable = `SELECT @@innodb_monitor_enable`;
 
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 SET GLOBAL innodb_monitor_enable='module_buffer_page';
 INSERT INTO t1 VALUES (1), (2), (3), (4); FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 SET GLOBAL innodb_monitor_disable='module_buffer_page';
 SET GLOBAL innodb_monitor_reset_all='module_buffer_page';
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 SET GLOBAL innodb_monitor_enable='%';
 INSERT INTO t1 VALUES (5), (6), (7), (8); FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 SET GLOBAL innodb_monitor_disable='%';
 SET GLOBAL innodb_monitor_reset_all='%';
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 SET GLOBAL innodb_monitor_enable='ALL';
 INSERT INTO t1 VALUES (9), (10), (11), (12); FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
+--replace_regex /[1-9]/NNNN/
 SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
-LIKE 'buffer_page_written_index_%';
+LIKE 'buffer_page_written_index_leaf';
 
 --disable_warnings
 SET GLOBAL innodb_monitor_enable=default;
@@ -438,4 +438,3 @@ SET GLOBAL innodb_monitor_reset_all=default;
 --enable_warnings
 
 DROP TABLE t1;
-SET GLOBAL innodb_purge_run_now = ON;