- Fixing innodb.purge_secondary test case.

MariaDB · Mar 23, 2018 · 7003067 · 7003067
1 parent f249d84
commit 7003067
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/mysql-test/suite/innodb/r/purge_secondary.result b/mysql-test/suite/innodb/r/purge_secondary.result
@@ -146,12 +146,7 @@ INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
-INSERT INTO t1 (a) SELECT NULL FROM t1;
-INSERT INTO t1 (a) SELECT NULL FROM t1;
-SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
-WHERE NAME="buffer_LRU_batch_evict_total_pages" AND COUNT > 0;
-NAME	SUBSYSTEM
-buffer_LRU_batch_evict_total_pages	buffer
+UPDATE t1 SET c=true, l=ST_linefromtext('linestring(0 0,1 1,2 2)');
 SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
 WHERE NAME="buffer_LRU_batch_flush_total_pages" AND COUNT > 0;
 NAME	SUBSYSTEM
@@ -160,6 +155,10 @@ SELECT (variable_value > 0) FROM information_schema.global_status
 WHERE LOWER(variable_name) LIKE 'INNODB_BUFFER_POOL_PAGES_FLUSHED';
 (variable_value > 0)
 1
+SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
+WHERE NAME="buffer_LRU_batch_evict_total_pages" AND COUNT > 0;
+NAME	SUBSYSTEM
+buffer_LRU_batch_evict_total_pages	buffer
 # Note: The OTHER_INDEX_SIZE does not cover any SPATIAL INDEX.
 # To test that all indexes were emptied, replace DROP TABLE
 # with the following, and examine the root pages in t1.ibd:

diff --git a/mysql-test/suite/innodb/t/purge_secondary.test b/mysql-test/suite/innodb/t/purge_secondary.test
@@ -129,18 +129,17 @@ INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
 INSERT INTO t1 (a) SELECT NULL FROM t1;
-INSERT INTO t1 (a) SELECT NULL FROM t1;
-INSERT INTO t1 (a) SELECT NULL FROM t1;
-
-SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
-WHERE NAME="buffer_LRU_batch_evict_total_pages" AND COUNT > 0;
+UPDATE t1 SET c=true, l=ST_linefromtext('linestring(0 0,1 1,2 2)');
 
 SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
 WHERE NAME="buffer_LRU_batch_flush_total_pages" AND COUNT > 0;
 
 SELECT (variable_value > 0) FROM information_schema.global_status
 WHERE LOWER(variable_name) LIKE 'INNODB_BUFFER_POOL_PAGES_FLUSHED';
 
+SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
+WHERE NAME="buffer_LRU_batch_evict_total_pages" AND COUNT > 0;
+
 --echo # Note: The OTHER_INDEX_SIZE does not cover any SPATIAL INDEX.
 --echo # To test that all indexes were emptied, replace DROP TABLE
 --echo # with the following, and examine the root pages in t1.ibd: