1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement a parameter for wait_all_purged.inc

Browse Source
This commit is contained in:
Marko Mäkelä 2018-07-05 13:15:35 +03:00
parent e9f1d8da57
commit fdb9e66fee
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test
View File

@ -124,7 +124,7 @@ SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
# Test adding virutal index on existing virtual column # Test adding index on existing virtual column
CREATE TABLE t1 (a INT, b INT, c INT GENERATED ALWAYS AS(a+b)); CREATE TABLE t1 (a INT, b INT, c INT GENERATED ALWAYS AS(a+b));
INSERT INTO t1(a, b) VALUES (1, 1), (2, 2), (3, 3), (4, 4); INSERT INTO t1(a, b) VALUES (1, 1), (2, 2), (3, 3), (4, 4);
@ -156,7 +156,9 @@ INSERT INTO t1(a, b) VALUES (8, 8);
COMMIT; COMMIT;
--echo # wait for purge to process the deleted/updated records. --echo # wait for purge to process the deleted/updated records.
let $wait_all_purged=1;
--source ../../innodb/include/wait_all_purged.inc --source ../../innodb/include/wait_all_purged.inc
let $wait_all_purged=0;
SET DEBUG_SYNC= 'now SIGNAL purged'; SET DEBUG_SYNC= 'now SIGNAL purged';

8
mysql-test/suite/innodb/include/wait_all_purged.inc
View File

@ -1,12 +1,18 @@
# Wait for everything to be purged. # Wait for everything to be purged.
# The user should have set innodb_purge_rseg_truncate_frequency=1. # The user should have set innodb_purge_rseg_truncate_frequency=1.
if (!$wait_all_purged)
{
let $wait_all_purged= 0;
}
let $remaining_expect= `select concat('InnoDB ',$wait_all_purged)`;
let $wait_counter= 300; let $wait_counter= 300;
while ($wait_counter) while ($wait_counter)
{ {
--replace_regex /.*History list length ([0-9]+).*/\1/ --replace_regex /.*History list length ([0-9]+).*/\1/
let $remaining= `SHOW ENGINE INNODB STATUS`; let $remaining= `SHOW ENGINE INNODB STATUS`;
if ($remaining == 'InnoDB 0') if ($remaining == $remaining_expect)
{ {
let $wait_counter= 0; let $wait_counter= 0;
} }