diff options
author | unknown <knielsen@knielsen-hq.org> | 2011-04-29 14:49:04 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2011-04-29 14:49:04 +0200 |
commit | fecd255a16fc3be6206e03ad5e70d8e90118acc6 (patch) | |
tree | 0ea93f5e6a5436a696bf7916814a6a6e525f4f25 /ibuf | |
parent | 8e0ed9eebaf088a6b50925aba2724d0848066d4a (diff) | |
download | mariadb-git-fecd255a16fc3be6206e03ad5e70d8e90118acc6.tar.gz |
Updated with changes from Percona Server 5.1.56-12.7, from
lp:~percona-dev/percona-server/release-5.1.56-12.7 percona-server-5.1.56-12.7
as of April 29, 2011.
Merged: revid:ignacio.nin@percona.com-20110427224434-e5a4kpyfwvj641q3
Diffstat (limited to 'ibuf')
-rw-r--r-- | ibuf/ibuf0ibuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ibuf/ibuf0ibuf.c b/ibuf/ibuf0ibuf.c index 12dbc29be23..3f741da60bb 100644 --- a/ibuf/ibuf0ibuf.c +++ b/ibuf/ibuf0ibuf.c @@ -1881,9 +1881,9 @@ ibuf_remove_free_page(void) fseg_free_page(header_page + IBUF_HEADER + IBUF_TREE_SEG_HEADER, IBUF_SPACE_ID, page_no, &mtr); -#ifdef UNIV_DEBUG_FILE_ACCESSES +#if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG buf_page_reset_file_page_was_freed(IBUF_SPACE_ID, page_no); -#endif +#endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */ ibuf_enter(); @@ -1925,9 +1925,9 @@ ibuf_remove_free_page(void) ibuf_bitmap_page_set_bits( bitmap_page, page_no, zip_size, IBUF_BITMAP_IBUF, FALSE, &mtr); -#ifdef UNIV_DEBUG_FILE_ACCESSES +#if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG buf_page_set_file_page_was_freed(IBUF_SPACE_ID, page_no); -#endif +#endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */ mtr_commit(&mtr); mutex_exit(&ibuf_mutex); |