bk commit into 5.0 tree (jan:1.1906)

[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.1906 05/05/24 14:06:44 jan@stripped +1 -0
  Print information about XA recovery only if there are prepared XA transactions
  after recovery.

  innobase/trx/trx0trx.c
    1.55 05/05/16 13:05:24 jan@stripped +11 -7
    Print information about XA recovery only if there are prepared XA transactions
    after 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.54/innobase/trx/trx0trx.c	Mon Mar 21 22:28:50 2005
+++ 1.55/innobase/trx/trx0trx.c	Mon May 16 13:05:24 2005
@@ -1926,10 +1926,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 */
 
@@ -1941,6 +1937,12 @@
 		if (trx->conc_state == TRX_PREPARED) {
 			xid_list[count] = trx->xid;
 
+			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",
@@ -1964,10 +1966,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);			
 }