diff options
| author | Inaam Rana <inaam.rana@oracle.com> | 2011-12-01 09:41:52 -0500 |
|---|---|---|
| committer | Inaam Rana <inaam.rana@oracle.com> | 2011-12-01 09:41:52 -0500 |
| commit | 943085828b53201d2560bd72b5c4c92f19542ee2 (patch) | |
| tree | 048057279d785d3cd98cca57bc7fd5086960a319 | |
| parent | 284f19cb564a0510b2f2f426af771c0ea0473c47 (diff) | |
| download | mariadb-git-943085828b53201d2560bd72b5c4c92f19542ee2.tar.gz | |
Bug#13414773 -INNODB_FAST_SHUTDOWN=2, ASSERT STATE == BUF_BLOCK_ZIP_PAGE
We can have dirty pages during a fast shutdown. Relax the assertion.
| -rw-r--r-- | storage/innodb_plugin/buf/buf0buf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c index d88860b807b..8332727cfde 100644 --- a/storage/innodb_plugin/buf/buf0buf.c +++ b/storage/innodb_plugin/buf/buf0buf.c @@ -957,8 +957,10 @@ buf_pool_free(void) ut_ad(bpage->in_LRU_list); if (state != BUF_BLOCK_FILE_PAGE) { - /* We must not have any dirty block. */ - ut_ad(state == BUF_BLOCK_ZIP_PAGE); + /* We must not have any dirty block except + when doing a fast shutdown. */ + ut_ad(state == BUF_BLOCK_ZIP_PAGE + || srv_fast_shutdown == 2); buf_page_free_descriptor(bpage); } |