Commit 52332cce authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
parents d9ac7c80 6975ce41

innobase/include/rem0rec.h

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ bits of a record. (Only compact records have status bits.) */ 
UNIV_INLINE

ulint

rec_get_info_and_status_bits(

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

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

			/* out: info bits */

	rec_t*	rec,	/* in: physical record */

	ibool	comp);	/* in: TRUE=compact page format */
@@ -149,7 +149,7 @@ bits of a record. (Only compact records have status bits.) */ 
UNIV_INLINE

void

rec_set_info_and_status_bits(

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

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

	rec_t*	rec,	/* in: physical record */

	ibool	comp,	/* in: TRUE=compact page format */

	ulint	bits);	/* in: info bits */

innobase/include/rem0rec.ic

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ rec_set_info_and_status_bits( 
	} else {

		ut_ad(!(bits & ~(REC_INFO_BITS_MASK >> REC_INFO_BITS_SHIFT)));

	}

	rec_set_info_bits(rec, bits & ~REC_NEW_STATUS_MASK, comp);

	rec_set_info_bits(rec, comp, bits & ~REC_NEW_STATUS_MASK);

}



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