Merge 10.3 into 10.4

MariaDB · Nov 7, 2019 · c24ec3c · c24ec3c
2 parents 928abd6 + 352e766
commit c24ec3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/r/ibuf_not_empty.result b/mysql-test/suite/innodb/r/ibuf_not_empty.result
@@ -24,6 +24,8 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	Warning	InnoDB: Index 'b' contains #### entries, should be 4096.
 test.t1	check	error	Corrupt
 # restart
+SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
+InnoDB		0 transactions not purged
 SET GLOBAL innodb_fast_shutdown=0;
 # restart
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/ibuf_not_empty.test b/mysql-test/suite/innodb/t/ibuf_not_empty.test
@@ -86,6 +86,12 @@ check table t1;
 
 --let $restart_parameters=
 --source include/restart_mysqld.inc
+
+# Ensure that the slow shutdown will not time out due to running purge.
+SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
+--source include/wait_all_purged.inc
+# The change buffer merge for the injected corruption must complete
+# without exceeding the 60-second shutdown_server timeout.
 SET GLOBAL innodb_fast_shutdown=0;
 --source include/restart_mysqld.inc