Commit 8f1883a4 authored by unknown's avatar unknown

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

after recovery.
parent 9281212c
...@@ -1926,10 +1926,6 @@ trx_recover_for_mysql( ...@@ -1926,10 +1926,6 @@ trx_recover_for_mysql(
ut_ad(xid_list); ut_ad(xid_list);
ut_ad(len); 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 /* We should set those transactions which are in the prepared state
to the xid_list */ to the xid_list */
...@@ -1941,6 +1937,12 @@ trx_recover_for_mysql( ...@@ -1941,6 +1937,12 @@ trx_recover_for_mysql(
if (trx->conc_state == TRX_PREPARED) { if (trx->conc_state == TRX_PREPARED) {
xid_list[count] = trx->xid; 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); 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",
...@@ -1964,10 +1966,12 @@ trx_recover_for_mysql( ...@@ -1964,10 +1966,12 @@ trx_recover_for_mysql(
mutex_exit(&kernel_mutex); mutex_exit(&kernel_mutex);
if (count > 0){
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB: %d transactions in prepared state after recovery\n", " InnoDB: %d transactions in prepared state after recovery\n",
count); count);
}
return (count); return (count);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment