diff options
| author | Inaam Rana <inaam.rana@oracle.com> | 2011-12-01 09:47:12 -0500 |
|---|---|---|
| committer | Inaam Rana <inaam.rana@oracle.com> | 2011-12-01 09:47:12 -0500 |
| commit | 8e6d41e278de3264d2a6e13cbc0ed328afca7f40 (patch) | |
| tree | 56224449c6f16068d87c71eda048225f82d2c1ea /storage | |
| parent | a22e18730801da2a3006a75b4dd5c3b0994fad82 (diff) | |
| parent | f22437ab503c2f5e73250210af032d66d87ff912 (diff) | |
| download | mariadb-git-8e6d41e278de3264d2a6e13cbc0ed328afca7f40.tar.gz | |
merge from mysql-5.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/buf/buf0buf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index 50f90b0918a..fbb6fecadf6 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/buf/buf0buf.c @@ -1230,8 +1230,10 @@ buf_pool_free_instance( 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); } |