Skip to content

Commit dc680d2

Browse files
committed
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.
1 parent 1766a18 commit dc680d2

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@ connection con2;
3131
commit;
3232
disconnect con2;
3333
connection default;
34+
SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
35+
SET GLOBAL innodb_max_purge_lag_wait=0;
3436
set global innodb_fast_shutdown=0;
3537
drop table t1, t2;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ connection default;
4545
let $trx_before= `SHOW ENGINE INNODB STATUS`;
4646
let $trx_before= `select substr('$trx_before',9)+2`;
4747

48+
SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
49+
SET GLOBAL innodb_max_purge_lag_wait=0;
4850
set global innodb_fast_shutdown=0;
4951
--source include/restart_mysqld.inc
5052
--replace_regex /.*Trx id counter ([0-9]+).*/\1/

0 commit comments

Comments
 (0)