Commit c0f189f8 authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/trx/trx0undo.c:
  Auto merged
parents 04f6f63d e424e20f

innobase/trx/trx0undo.c

+12 −16
Original line number Diff line number Diff line
@@ -559,14 +559,14 @@ trx_undo_write_xid( 
	const XID*	xid,	/* in: X/Open XA Transaction Identification */

	mtr_t*		mtr)	/* in: mtr */

{

	mlog_write_ulint(log_hdr + TRX_UNDO_XA_FORMAT, xid->formatID,

							MLOG_4BYTES, mtr);

	mlog_write_ulint(log_hdr + TRX_UNDO_XA_FORMAT,

			(ulint)xid->formatID, MLOG_4BYTES, mtr);



	mlog_write_ulint(log_hdr + TRX_UNDO_XA_TRID_LEN, xid->gtrid_length,

							MLOG_4BYTES, mtr);

	mlog_write_ulint(log_hdr + TRX_UNDO_XA_TRID_LEN,

			(ulint)xid->gtrid_length, MLOG_4BYTES, mtr);



	mlog_write_ulint(log_hdr + TRX_UNDO_XA_BQUAL_LEN, xid->bqual_length,

							MLOG_4BYTES, mtr);

	mlog_write_ulint(log_hdr + TRX_UNDO_XA_BQUAL_LEN,

			(ulint)xid->bqual_length, MLOG_4BYTES, mtr);



	mlog_write_string(log_hdr + TRX_UNDO_XA_XID, (const byte*) xid->data,

							XIDDATASIZE, mtr);
@@ -581,18 +581,14 @@ trx_undo_read_xid( 
	trx_ulogf_t*	log_hdr,/* in: undo log header */

	XID*		xid)	/* out: X/Open XA Transaction Identification */

{

	ulint i;

	xid->formatID = (long)mach_read_from_4(log_hdr + TRX_UNDO_XA_FORMAT);

	

	xid->formatID = mach_read_from_4(log_hdr + TRX_UNDO_XA_FORMAT);

	xid->gtrid_length =

			(long)mach_read_from_4(log_hdr + TRX_UNDO_XA_TRID_LEN);

	xid->bqual_length =

		  (long)mach_read_from_4(log_hdr + TRX_UNDO_XA_BQUAL_LEN);



	xid->gtrid_length = mach_read_from_4(log_hdr + TRX_UNDO_XA_TRID_LEN);



	xid->bqual_length = mach_read_from_4(log_hdr + TRX_UNDO_XA_BQUAL_LEN);



	for (i = 0; i < XIDDATASIZE; i++) {

		xid->data[i] = (char)mach_read_from_1(log_hdr + 

							TRX_UNDO_XA_XID + i);

	}

	memcpy(xid->data, log_hdr + TRX_UNDO_XA_XID, XIDDATASIZE);

}



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