diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 07:39:55 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 07:39:55 +0200 |
| commit | c24ec3cece6d8bf70dac7519b6fd397c464f7a82 (patch) | |
| tree | 8e7468426afe1f18f44650fb5f605cf7247037a9 | |
| parent | 928abd6967b7925c3cd7fdf53f31d0b0fb307e41 (diff) | |
| parent | 352e7667877ec6603aff5234c003ef8c11885cd8 (diff) | |
| download | mariadb-git-c24ec3cece6d8bf70dac7519b6fd397c464f7a82.tar.gz | |
Merge 10.3 into 10.4mariadb-10.4.10
| -rw-r--r-- | mysql-test/suite/innodb/r/ibuf_not_empty.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/ibuf_not_empty.test | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/ibuf_not_empty.result b/mysql-test/suite/innodb/r/ibuf_not_empty.result index 3c225db74b4..dc852dfb8e5 100644 --- 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 index 8ab33a272c1..14d8728cdf8 100644 --- 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 |