diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-02-22 14:39:15 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-02-22 14:39:15 +0200 |
| commit | 0865c81c09e54516f5fd17b23bb0fedde61eee06 (patch) | |
| tree | 6269c1c04b5e493747e36805c6869d15ca345ae0 /innobase/trx | |
| parent | f7c60b9f038840a4c590c8bba20b81a259557faf (diff) | |
| download | mariadb-git-0865c81c09e54516f5fd17b23bb0fedde61eee06.tar.gz | |
Copy X/Open XA XID from trx structure to a list in recovery.
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index eee0d43ce56..7d5370b1ac1 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -1848,7 +1848,7 @@ trx_recover_for_mysql( ulint len) /* in: number of slots in xid_list */ { trx_t* trx; - int num_of_transactions = 0; + int count = 0; ut_ad(xid_list); ut_ad(len); @@ -1866,7 +1866,16 @@ trx_recover_for_mysql( while (trx) { if (trx->conc_state == TRX_PREPARED) { - xid_list[num_of_transactions] = trx->xid; + xid_list[count].formatID = trx->xid.formatID; + xid_list[count].gtrid_length = trx->xid.gtrid_length; + xid_list[count].bqual_length = trx->xid.bqual_length; + + memcpy(xid_list[count].data, + trx->xid.data, + trx->xid.gtrid_length + + trx->xid.bqual_length); + + ut_print_timestamp(stderr); fprintf(stderr, "InnoDB: Transaction %lu %lu in prepared state after recovery\n", @@ -1877,9 +1886,9 @@ trx_recover_for_mysql( "InnoDB: Transaction contains changes to %lu rows\n", (ulong)ut_conv_dulint_to_longlong(trx->undo_no)); - num_of_transactions++; + count++; - if ((uint)num_of_transactions == len ) { + if ((uint)count == len ) { break; } } @@ -1891,9 +1900,9 @@ trx_recover_for_mysql( fprintf(stderr, "InnoDB: %d transactions in prepare state after recovery\n", - num_of_transactions); + count); - return (num_of_transactions); + return (count); } /*********************************************************************** |