Commit 87fc6265 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 15daae5a 340053df

innobase/ibuf/ibuf0ibuf.c

+6 −9
Original line number Diff line number Diff line
@@ -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;

	}