diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-08-01 15:36:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-08-01 15:36:37 +0200 |
| commit | 87fc6265ce97bd4ecd77b72c6507bee15143bb9e (patch) | |
| tree | 4954921b9bc60b3a4cc625d66056a2bee688545c | |
| parent | 15daae5aef200762268fd0170237ec5336fbddf7 (diff) | |
| parent | 340053df4ed7215517de0a67fd5e79bee5251d38 (diff) | |
| download | mariadb-git-87fc6265ce97bd4ecd77b72c6507bee15143bb9e.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| -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; } |