bk commit into 5.0 tree (jan:1.1872)

[jan.lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1872 05/02/22 14:39:15 jan@stripped +1 -0
  Copy X/Open XA XID from trx structure to a list in recovery.

  innobase/trx/trx0trx.c
    1.44 05/02/22 14:38:46 jan@stripped +15 -6
    Copy X/Open XA XID from trx structure to a list in recovery.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jan
# Host:	hundin.mysql.fi
# Root:	/home/jan/mysql-5.0

--- 1.43/innobase/trx/trx0trx.c	Mon Feb 14 19:45:24 2005
+++ 1.44/innobase/trx/trx0trx.c	Tue Feb 22 14:38:46 2005
@@ -1848,7 +1848,7 @@
 	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 @@
 
 	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 @@
 "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 @@
 
 	fprintf(stderr,
 		"InnoDB: %d transactions in prepare state after recovery\n",
-		num_of_transactions);
+		count);
 
-	return (num_of_transactions);			
+	return (count);			
 }
 
 /***********************************************************************