1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl

Browse Source 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
This commit is contained in:
lars/lthalmann@mysql.com/dl145j.mysql.com 2006-07-31 21:30:24 +02:00
commit 635281619b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
innobase/ibuf/ibuf0ibuf.c
View File

@ -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;
}