diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-16 09:58:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-16 09:58:02 +0200 |
| commit | b9692a96bea247e1ec8ca24b8a2159655bc442e5 (patch) | |
| tree | 630a6791aaf32adbb7011ec21015bffbad2696e9 | |
| parent | d9aeddf76a9d106c77d0faa77dc19142e9077b26 (diff) | |
| parent | a0ba966db7576569bd0b8e26d44ba9d86ca8f53c (diff) | |
| download | mariadb-git-b9692a96bea247e1ec8ca24b8a2159655bc442e5.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
| -rw-r--r-- | storage/innobase/buf/buf0buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index 890d0282286..68faafacb83 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/buf/buf0buf.c @@ -2830,7 +2830,7 @@ buf_page_get_known_nowait( ut_a(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE); #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG - ut_a(block->page.file_page_was_freed == FALSE); + ut_a(mode == BUF_KEEP_OLD || !block->page.file_page_was_freed); #endif #ifdef UNIV_IBUF_COUNT_DEBUG |