Skip to content

Commit ab56cbc

Browse files
committed
Stabilize and clean up a test
The counter buffer_flush_background_total_pages may be unreliable, because pages can be flushed in different means. So, let us only check INNODB_BUFFER_POOL_PAGES_FLUSHED.
1 parent d61c569 commit ab56cbc

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,9 @@ WHERE NAME='test/t1';
141141
OTHER_INDEX_SIZE
142142
1
143143
ALTER TABLE t1 DROP INDEX `sidx`;
144-
INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
145-
INSERT INTO t1 (a) SELECT NULL FROM t1;
146-
INSERT INTO t1 (a) SELECT NULL FROM t1;
147-
INSERT INTO t1 (a) SELECT NULL FROM t1;
148-
INSERT INTO t1 (a) SELECT NULL FROM t1;
149-
INSERT INTO t1 (a) SELECT NULL FROM t1;
144+
INSERT INTO t1 (a) SELECT * FROM seq_1_to_544;
150145
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
151146
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
152-
SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
153-
WHERE NAME="buffer_LRU_batch_flush_total_pages" AND COUNT > 0;
154-
NAME SUBSYSTEM
155-
buffer_LRU_batch_flush_total_pages buffer
156147
SELECT (variable_value > 0) FROM information_schema.global_status
157148
WHERE LOWER(variable_name) LIKE 'INNODB_BUFFER_POOL_PAGES_FLUSHED';
158149
(variable_value > 0)

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
--source include/have_innodb.inc
2+
--source include/have_sequence.inc
23

34
# Ensure that the history list length will actually be decremented by purge.
45
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
@@ -123,18 +124,10 @@ WHERE NAME='test/t1';
123124
# Work around MDEV-13942, Dropping the spatial index to avoid the possible hang
124125
ALTER TABLE t1 DROP INDEX `sidx`;
125126

126-
INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
127-
INSERT INTO t1 (a) SELECT NULL FROM t1;
128-
INSERT INTO t1 (a) SELECT NULL FROM t1;
129-
INSERT INTO t1 (a) SELECT NULL FROM t1;
130-
INSERT INTO t1 (a) SELECT NULL FROM t1;
131-
INSERT INTO t1 (a) SELECT NULL FROM t1;
127+
INSERT INTO t1 (a) SELECT * FROM seq_1_to_544;
132128
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
133129
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
134130

135-
SELECT NAME, SUBSYSTEM FROM INFORMATION_SCHEMA.INNODB_METRICS
136-
WHERE NAME="buffer_LRU_batch_flush_total_pages" AND COUNT > 0;
137-
138131
SELECT (variable_value > 0) FROM information_schema.global_status
139132
WHERE LOWER(variable_name) LIKE 'INNODB_BUFFER_POOL_PAGES_FLUSHED';
140133

0 commit comments

Comments
 (0)