Commit 8ddb0ddc authored by unknown's avatar unknown
Browse files

Print information about XA recovery only if there are prepared XA transactions 

after recovery.
parent d0afc349

innobase/trx/trx0trx.c

+11 −7
Original line number Diff line number Diff line
@@ -1926,10 +1926,6 @@ trx_recover_for_mysql( 
	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 @@ trx_recover_for_mysql( 
		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 @@ trx_recover_for_mysql( 


	mutex_exit(&kernel_mutex);



	if (count > 0){

		ut_print_timestamp(stderr);

		fprintf(stderr,

"  InnoDB: %d transactions in prepared state after recovery\n",

			count);

	}



	return (count);			

}