mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applied innodb-5.0-ss660 snapshot.

Browse source
This commit is contained in:
aivanov@mysql.com 2006-07-26 08:26:07 +04:00
parent e7548d2321
commit 9441aa22ea
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
innobase/btr/btr0cur.c
View file

@ -439,7 +439,7 @@ retry_page_get:
if (UNIV_LIKELY_NULL(heap)) {
mem_heap_free(heap);
}
return;
goto func_exit;
}
/* Insert to the insert buffer did not succeed:
@ -555,6 +555,7 @@ retry_page_get:
|| mode != PAGE_CUR_LE);
}
func_exit:
if (has_search_latch) {
rw_lock_s_lock(&btr_search_latch);

15
innobase/ibuf/ibuf0ibuf.c
View file

@ -950,14 +950,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));
}
/***************************************************************************
@ -981,7 +978,7 @@ ibuf_page(
return(FALSE);
}
if (ibuf_fixed_addr_page(page_no)) {
if (ibuf_fixed_addr_page(space, page_no)) {
return(TRUE);
}
@ -1029,7 +1026,7 @@ ibuf_page_low(
return(FALSE);
}
#endif
if (ibuf_fixed_addr_page(page_no)) {
if (ibuf_fixed_addr_page(space, page_no)) {
return(TRUE);
}
@ -3052,7 +3049,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;
}

2
innobase/include/sync0rw.ic
View file

@ -362,7 +362,7 @@ rw_lock_s_unlock_func(
/* Reset the shared lock by decrementing the reader count */
ut_ad(lock->reader_count > 0);
ut_a(lock->reader_count > 0);
lock->reader_count--;
#ifdef UNIV_SYNC_DEBUG