diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-05-24 14:06:44 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-05-24 14:06:44 +0300 |
| commit | 8ddb0ddc5cf302a88372ba877ad843b049de1121 (patch) | |
| tree | d143a28f04ecbf413c6b44c7849b4406e7b765f3 /innobase/trx | |
| parent | d0afc3492e6e8fd54c179430ca8ea0b56dabe658 (diff) | |
| download | mariadb-git-8ddb0ddc5cf302a88372ba877ad843b049de1121.tar.gz | |
Print information about XA recovery only if there are prepared XA transactions
after recovery.
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index cdda1dd4dee..c6d1f953772 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -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); - 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); } |