diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-06-21 20:15:22 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-06-21 20:15:22 +0300 |
| commit | c0f189f83a336864904b41e527a651a7746c6125 (patch) | |
| tree | 9305651bb954f900d1ba12287ba00b366d5c4566 /innobase/trx | |
| parent | 04f6f63dd8bdcb4e0d5e7cc6b2200a87eff037fe (diff) | |
| parent | e424e20f6566544ace55b85a016a200e6d0f9603 (diff) | |
| download | mariadb-git-c0f189f83a336864904b41e527a651a7746c6125.tar.gz | |
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
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0undo.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c index c14e4a1f3ab..7441dd3f152 100644 --- a/innobase/trx/trx0undo.c +++ b/innobase/trx/trx0undo.c @@ -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 = mach_read_from_4(log_hdr + TRX_UNDO_XA_FORMAT); + xid->formatID = (long)mach_read_from_4(log_hdr + TRX_UNDO_XA_FORMAT); - 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); + 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); - 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); } /******************************************************************* |