Commit 03206fd7 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


extra/yassl/src/ssl.cpp:
  Auto merged
parents 7c7396ce 78e24656

innobase/btr/btr0cur.c

+2 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ btr_cur_search_to_nth_level( 
				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 @@ btr_cur_search_to_nth_level( 
						|| mode != PAGE_CUR_LE);

	}



func_exit:

	if (has_search_latch) {

		

		rw_lock_s_lock(&btr_search_latch);

innobase/ibuf/ibuf0ibuf.c

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

	}

innobase/include/sync0rw.ic

+1 −1
Original line number Diff line number Diff line
@@ -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