1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copy X/Open XA XID from trx structure to a list in recovery.

Browse Source
This commit is contained in:
unknown 2005-02-22 14:39:15 +02:00
parent f7c60b9f03
commit 0865c81c09
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
innobase/trx/trx0trx.c
View File

@ -1848,7 +1848,7 @@ trx_recover_for_mysql(
ulint len) /* in: number of slots in xid_list */ ulint len) /* in: number of slots in xid_list */
{ {
trx_t* trx; trx_t* trx;
int num_of_transactions = 0; int count = 0;
ut_ad(xid_list); ut_ad(xid_list);
ut_ad(len); ut_ad(len);
@ -1866,7 +1866,16 @@ trx_recover_for_mysql(
while (trx) { while (trx) {
if (trx->conc_state == TRX_PREPARED) { 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, fprintf(stderr,
"InnoDB: Transaction %lu %lu in prepared state after recovery\n", "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", "InnoDB: Transaction contains changes to %lu rows\n",
(ulong)ut_conv_dulint_to_longlong(trx->undo_no)); (ulong)ut_conv_dulint_to_longlong(trx->undo_no));
num_of_transactions++; count++;
if ((uint)num_of_transactions == len ) { if ((uint)count == len ) {
break; break;
} }
} }
@ -1891,9 +1900,9 @@ trx_recover_for_mysql(
fprintf(stderr, fprintf(stderr,
"InnoDB: %d transactions in prepare state after recovery\n", "InnoDB: %d transactions in prepare state after recovery\n",
num_of_transactions); count);
return (num_of_transactions); return (count);
} }
/*********************************************************************** /***********************************************************************