bk commit into 5.0 tree (jan:1.1820)

[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.1820 05/03/17 07:54:40 jan@stripped +1 -0
  Fixed a feature where InnoDB printed Starting recovery for XA
  transactions even when there was no XA transactions to recover.

  innobase/trx/trx0trx.c
    1.55 05/03/17 07:54:32 jan@stripped +14 -7
    Fixed a feature where InnoDB printed Starting recovery for XA
    transactions even when there was no XA transactions to recover.

# 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.54/innobase/trx/trx0trx.c	Wed Mar 16 07:23:35 2005
+++ 1.55/innobase/trx/trx0trx.c	Thu Mar 17 07:54:32 2005
@@ -1918,10 +1918,6 @@
 	ut_ad(xid_list);
 	ut_ad(len);
 
-	ut_print_timestamp(stderr);
-	fprintf(stderr,
-		"  InnoDB: Starting recovery for XA transactions...\n");
-
 	/* We should set those transactions which are in the prepared state
 	to the xid_list */
 
@@ -1933,6 +1929,15 @@
 		if (trx->conc_state == TRX_PREPARED) {
 			trx_copy_xid(&(xid_list[count]), trx->xid);
 
+			/* Print this only to a first transaction in
+			the prepared state */
+
+			if (count == 0) {
+				ut_print_timestamp(stderr);
+				fprintf(stderr,
+"  InnoDB: Starting recovery for XA transactions...\n");
+			}
+
 			ut_print_timestamp(stderr);
 			fprintf(stderr,
 "  InnoDB: Transaction %lu %lu in prepared state after recovery\n",
@@ -1956,10 +1961,12 @@
 
 	mutex_exit(&kernel_mutex);
 
-	ut_print_timestamp(stderr);
-	fprintf(stderr,
+	if (count > 0) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
 "  InnoDB: %d transactions in prepared state after recovery\n",
-		count);
+			count);
+	}
 
 	return (count);			
 }