diff options
| author | serg@serg.mylan <> | 2005-02-14 21:50:09 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-02-14 21:50:09 +0100 |
| commit | fd828e5b4d7f20a64bccfc25a096ca94760bcec9 (patch) | |
| tree | ea9dd08a255018554104b4f137dea7cfe36ece0a /innobase/trx | |
| parent | 2b49bea59a594a0f4a87200adca21fb0cc3b2893 (diff) | |
| parent | db13afd89db4a415e2a77b0c200a1391ea2f03fe (diff) | |
| download | mariadb-git-fd828e5b4d7f20a64bccfc25a096ca94760bcec9.tar.gz | |
manually merged
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index f254f3ff904..eee0d43ce56 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -1617,20 +1617,21 @@ trx_print( (ulong) ut_dulint_get_high(trx->id), (ulong) ut_dulint_get_low(trx->id)); - switch (trx->conc_state) { + switch (trx->conc_state) { case TRX_NOT_STARTED: fputs(", not started", f); break; case TRX_ACTIVE: + case TRX_PREPARED: fprintf(f, ", ACTIVE %lu sec", (ulong)difftime(time(NULL), trx->start_time)); - break; + break; case TRX_COMMITTED_IN_MEMORY: fputs(", COMMITTED IN MEMORY", f); break; default: fprintf(f, " state %lu", (ulong) trx->conc_state); - } + } #ifdef UNIV_LINUX fprintf(f, ", process no %lu", trx->mysql_process_no); |