Skip to content

Commit

Permalink
MDEV-15384 buf_flush_LRU_list_batch() always reports n->flushed=0, n-…
Browse files Browse the repository at this point in the history
…>evicted=0

- Work around for MDEV-13942: Drop spatial index to avoid possible hang
  • Loading branch information
Thirunarayanan committed Mar 15, 2018
1 parent be3651b commit 8c8028c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
14 changes: 9 additions & 5 deletions mysql-test/suite/innodb/r/purge_secondary.result
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ l LINESTRING NOT NULL DEFAULT ST_linefromtext('linestring(448 -689,
9716 9648,9720 9650,9721 9648,9723 9648,9726 4648,12726 4653,12731 4655,
12734 4660,12730 4661,12733 4664,12733 4665,12735 4670,12737 4674,12741 4674,
12738 4675,12740 4675,12737 4675,12742 4678,12743 4681,12746 4677)'),
INDEX(b,c), SPATIAL INDEX(l)
INDEX(b,c), SPATIAL INDEX `sidx`(l)
) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
SELECT LENGTH(l) FROM t1;
Expand All @@ -123,10 +123,6 @@ LENGTH(l)
11197
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;
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
Expand All @@ -143,6 +139,14 @@ SELECT OTHER_INDEX_SIZE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE NAME='test/t1';
OTHER_INDEX_SIZE
1
ALTER TABLE t1 DROP INDEX `sidx`;
INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
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
Expand Down
17 changes: 12 additions & 5 deletions mysql-test/suite/innodb/t/purge_secondary.test
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,12 @@ CREATE TABLE t1 (
9716 9648,9720 9650,9721 9648,9723 9648,9726 4648,12726 4653,12731 4655,
12734 4660,12730 4661,12733 4664,12733 4665,12735 4670,12737 4674,12741 4674,
12738 4675,12740 4675,12737 4675,12742 4678,12743 4681,12746 4677)'),
INDEX(b,c), SPATIAL INDEX(l)
INDEX(b,c), SPATIAL INDEX `sidx`(l)
) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
SELECT LENGTH(l) 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;
INSERT INTO t1 (a) SELECT NULL FROM t1;
CHECK TABLE t1;
UPDATE t1 SET c=true, l=ST_linefromtext('linestring(0 0,1 1,2 2)');
DELETE FROM t1;
Expand All @@ -124,6 +120,17 @@ ANALYZE TABLE t1;
SELECT OTHER_INDEX_SIZE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE NAME='test/t1';

# Work around MDEV-13942, Dropping the spatial index to avoid the possible hang
ALTER TABLE t1 DROP INDEX `sidx`;

INSERT INTO t1 () VALUES (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
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;

Expand Down

0 comments on commit 8c8028c

Please sign in to comment.