diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-07-31 21:30:24 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-07-31 21:30:24 +0200 |
| commit | 76f65b3fb38d45dbd8b954cc2ded383d6179e13d (patch) | |
| tree | e450c775df74ee907c7127676dfd23e5f263ebd5 | |
| parent | d9992cc79eb8c51c2b967ec60137638583a8143d (diff) | |
| parent | 03637f493e21efc5681d6cb141a484ea0bbe838c (diff) | |
| download | mariadb-git-76f65b3fb38d45dbd8b954cc2ded383d6179e13d.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
| -rw-r--r-- | innobase/ibuf/ibuf0ibuf.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index 2191cdc0ee6..a0011629427 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -945,14 +945,11 @@ ibool ibuf_fixed_addr_page( /*=================*/ /* out: TRUE if a fixed address ibuf i/o page */ + ulint space, /* in: space id */ ulint page_no)/* in: page number */ { - if ((ibuf_bitmap_page(page_no)) - || (page_no == IBUF_TREE_ROOT_PAGE_NO)) { - return(TRUE); - } - - return(FALSE); + return((space == 0 && page_no == IBUF_TREE_ROOT_PAGE_NO) + || ibuf_bitmap_page(page_no)); } /*************************************************************************** @@ -976,7 +973,7 @@ ibuf_page( return(FALSE); } - if (ibuf_fixed_addr_page(page_no)) { + if (ibuf_fixed_addr_page(space, page_no)) { return(TRUE); } @@ -1024,7 +1021,7 @@ ibuf_page_low( return(FALSE); } #endif - if (ibuf_fixed_addr_page(page_no)) { + if (ibuf_fixed_addr_page(space, page_no)) { return(TRUE); } @@ -2931,7 +2928,7 @@ ibuf_merge_or_delete_for_page( return; } #endif - if (ibuf_fixed_addr_page(page_no) || fsp_descr_page(page_no) + if (ibuf_fixed_addr_page(space, page_no) || fsp_descr_page(page_no) || trx_sys_hdr_page(space, page_no)) { return; } |