diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 16:14:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 16:14:06 +0200 |
| commit | dc680d2119d3cc4ad642e5c1f11f38ab072b3032 (patch) | |
| tree | 05b983ffe75f10af079fb7635ef971c6650f8a40 | |
| parent | 1766a18e06a056155031dabefb88ce7f201ad921 (diff) | |
| download | mariadb-git-dc680d2119d3cc4ad642e5c1f11f38ab072b3032.tar.gz | |
Avoid shutdown timeout in innodb.undo_truncate
Let us explicitly wait for purge before invoking a slow shutdown,
so that instrumented builds (such as ASAN or UBSAN) will not
exceed the 60-second timeout during shutdown.
| -rw-r--r-- | mysql-test/suite/innodb/r/undo_truncate.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/undo_truncate.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/undo_truncate.result b/mysql-test/suite/innodb/r/undo_truncate.result index 4b185a58d2c..1cc4fb2857c 100644 --- a/mysql-test/suite/innodb/r/undo_truncate.result +++ b/mysql-test/suite/innodb/r/undo_truncate.result @@ -31,5 +31,7 @@ connection con2; commit; disconnect con2; connection default; +SET GLOBAL innodb_purge_rseg_truncate_frequency=1; +SET GLOBAL innodb_max_purge_lag_wait=0; set global innodb_fast_shutdown=0; drop table t1, t2; diff --git a/mysql-test/suite/innodb/t/undo_truncate.test b/mysql-test/suite/innodb/t/undo_truncate.test index 51bb4f4b9fc..2ca4f67d0bf 100644 --- a/mysql-test/suite/innodb/t/undo_truncate.test +++ b/mysql-test/suite/innodb/t/undo_truncate.test @@ -45,6 +45,8 @@ connection default; let $trx_before= `SHOW ENGINE INNODB STATUS`; let $trx_before= `select substr('$trx_before',9)+2`; +SET GLOBAL innodb_purge_rseg_truncate_frequency=1; +SET GLOBAL innodb_max_purge_lag_wait=0; set global innodb_fast_shutdown=0; --source include/restart_mysqld.inc --replace_regex /.*Trx id counter ([0-9]+).*/\1/ |