diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-26 13:53:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-26 23:03:33 +0300 |
| commit | 67e9c4cf6c70480dfbd80e1565faf25c17f398a9 (patch) | |
| tree | f4a33df5e6143072e02b979bc2e8c8a4ee45c7bd /storage/innobase | |
| parent | 7223ec4ca79a436509a1734c8cfb082927159143 (diff) | |
| download | mariadb-git-67e9c4cf6c70480dfbd80e1565faf25c17f398a9.tar.gz | |
Adapt the test case for Oracle Bug#25385590
buf_chunk_not_freed(), logs_empty_and_mark_files_at_shutdown():
Relax debug assertions when innodb_force_recovery=6
implies innodb_read_only.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 3761d81b2d1..a1efa446f76 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -1762,7 +1762,9 @@ buf_chunk_not_freed( == block->page.newest_modification); ut_ad(block->page.oldest_modification == 0 || block->page.oldest_modification - == recv_sys->recovered_lsn); + == recv_sys->recovered_lsn + || srv_force_recovery + == SRV_FORCE_NO_LOG_REDO); ut_ad(block->page.buf_fix_count == 0); ut_ad(block->page.io_fix == BUF_IO_NONE); break; diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index bf228c077a5..7d4e0459610 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -2172,7 +2172,8 @@ wait_suspend_loop: bool freed = buf_all_freed(); ut_a(freed); - ut_a(lsn == log_sys->lsn); + ut_a(lsn == log_sys->lsn + || srv_force_recovery == SRV_FORCE_NO_LOG_REDO); if (lsn < srv_start_lsn) { ib::error() << "Shutdown LSN=" << lsn @@ -2198,7 +2199,8 @@ wait_suspend_loop: freed = buf_all_freed(); ut_a(freed); - ut_a(lsn == log_sys->lsn); + ut_a(lsn == log_sys->lsn + || srv_force_recovery == SRV_FORCE_NO_LOG_REDO); } /******************************************************//** |