diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-01-17 09:09:59 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-01-17 09:09:59 +0200 |
| commit | e1f13fb2e02949bf8cbf6894581b94b7f850eef7 (patch) | |
| tree | f3c7a39fbbd795b1af48391166a7c81925857142 /innobase/trx | |
| parent | a7401bf7cc1646f76710992cd77c54b97df8d860 (diff) | |
| download | mariadb-git-e1f13fb2e02949bf8cbf6894581b94b7f850eef7.tar.gz | |
Required changes to support recovery of X/Open XA in InnoDB.
innobase/lock/lock0lock.c:
Add prepared state to concurrency states in lock validate.
innobase/trx/trx0trx.c:
Prepared transactions are active transactions in file based word.
sql/ha_innodb.cc:
Add full support of X/Open XA to InnoDB.
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 51f0fbd7b93..e468b1c9f13 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -1612,12 +1612,10 @@ trx_print( fputs(", not started", f); break; case TRX_ACTIVE: + case TRX_PREPARED: fprintf(f, ", ACTIVE %lu sec", (ulong)difftime(time(NULL), trx->start_time)); break; - case TRX_PREPARED: - fputs(", PREPARED", f); - break; case TRX_COMMITTED_IN_MEMORY: fputs(", COMMITTED IN MEMORY", f); break; |