Commit b5469837 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/home/my/mysql-4.0
parents e11a162b 5164e291

innobase/btr/btr0cur.c

+11 −1
Original line number Diff line number Diff line
@@ -65,6 +65,16 @@ this many index pages */ 
/*--------------------------------------*/

#define BTR_BLOB_HDR_SIZE		8



/***********************************************************************

Marks all extern fields in a record as owned by the record. This function

should be called if the delete mark of a record is removed: a not delete

marked record always owns all its extern fields. */

static

void

btr_cur_unmark_extern_fields(

/*=========================*/

	rec_t*	rec,	/* in: record in a clustered index */

	mtr_t*	mtr);	/* in: mtr */

/***********************************************************************

Adds path information to the cursor for the current page, for which

the binary search has been performed. */
@@ -2922,7 +2932,7 @@ btr_cur_mark_dtuple_inherited_extern( 
Marks all extern fields in a record as owned by the record. This function

should be called if the delete mark of a record is removed: a not delete

marked record always owns all its extern fields. */



static

void

btr_cur_unmark_extern_fields(

/*=========================*/

innobase/btr/btr0sea.c

+2 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ Created 2/17/1996 Heikki Tuuri 
ulint	btr_search_this_is_zero = 0;	/* A dummy variable to fool the

					compiler */



#ifdef UNIV_SEARCH_PERF_STAT

ulint	btr_search_n_succ	= 0;

#endif /* UNIV_SEARCH_PERF_STAT */

ulint	btr_search_n_hash_fail	= 0;



byte	btr_sea_pad1[64];	/* padding to prevent other memory update

innobase/include/btr0cur.h

+0 −10
Original line number Diff line number Diff line
@@ -435,16 +435,6 @@ btr_cur_mark_dtuple_inherited_extern( 
	ulint		n_ext_vec,	/* in: number of elements in ext_vec */

	upd_t*		update);	/* in: update vector */

/***********************************************************************

Marks all extern fields in a record as owned by the record. This function

should be called if the delete mark of a record is removed: a not delete

marked record always owns all its extern fields. */



void

btr_cur_unmark_extern_fields(

/*=========================*/

	rec_t*	rec,	/* in: record in a clustered index */

	mtr_t*	mtr);	/* in: mtr */

/***********************************************************************

Marks all extern fields in a dtuple as owned by the record. */



void

innobase/include/btr0sea.h

+2 −0
Original line number Diff line number Diff line
@@ -214,7 +214,9 @@ extern rw_lock_t* btr_search_latch_temp; 


#define btr_search_latch	(*btr_search_latch_temp)



#ifdef UNIV_SEARCH_PERF_STAT

extern ulint	btr_search_n_succ;

#endif /* UNIV_SEARCH_PERF_STAT */

extern ulint	btr_search_n_hash_fail;



/* After change in n_fields or n_bytes in info, this many rounds are waited

innobase/include/page0cur.h

+4 −1
Original line number Diff line number Diff line
@@ -32,8 +32,11 @@ Created 10/4/1994 Heikki Tuuri 
				 which extend it */

#define	PAGE_CUR_DBG	6





#ifdef PAGE_CUR_ADAPT

# ifdef UNIV_SEARCH_PERF_STAT

extern ulint	page_cur_short_succ;

# endif /* UNIV_SEARCH_PERF_STAT */

#endif /* PAGE_CUR_ADAPT */



/*************************************************************

Gets pointer to the page frame where the cursor is positioned. */