diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-10-13 17:57:57 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-10-13 17:57:57 +0000 |
| commit | 84cc9a4bb3c86345f58aa786715f0cdcb479a343 (patch) | |
| tree | 4742c7d669f991a1503d5be05ebfdfd9cfb3e0b7 /src/backend/access/transam | |
| parent | 90c22c9206bff2d55dae79cebbc2e71fb48e88f1 (diff) | |
| download | postgresql-84cc9a4bb3c86345f58aa786715f0cdcb479a343.tar.gz postgresql-84cc9a4bb3c86345f58aa786715f0cdcb479a343.zip | |
Back out this because of fear of changing error strings:
This makes the error messages for PREPARE TRANSACTION, COMMIT PREPARED
etc. match the docs, which talk about "transaction identifier" not
"gid" or "global transaction identifier".
Steve Woodcock
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index f23fea2247d..2c7f400b71d 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.12 2005/10/13 17:57:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.13 2005/10/13 17:57:57 momjian Exp $ * * NOTES * Each global transaction is associated with a global transaction @@ -221,7 +221,7 @@ MarkAsPreparing(TransactionId xid, const char *gid, if (strlen(gid) >= GIDSIZE) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("transaction identifier \"%s\" is too long", + errmsg("global transaction identifier \"%s\" is too long", gid))); LWLockAcquire(TwoPhaseStateLock, LW_EXCLUSIVE); @@ -256,7 +256,7 @@ MarkAsPreparing(TransactionId xid, const char *gid, { ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), - errmsg("transaction identifier \"%s\" is already in use", + errmsg("global transaction identifier \"%s\" is already in use", gid))); } } @@ -380,7 +380,7 @@ LockGXact(const char *gid, Oid user) if (TransactionIdIsActive(gxact->locking_xid)) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("prepared transaction with identifier \"%s\" is busy", + errmsg("prepared transaction with gid \"%s\" is busy", gid))); gxact->locking_xid = InvalidTransactionId; } @@ -403,7 +403,7 @@ LockGXact(const char *gid, Oid user) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("prepared transaction with identifier \"%s\" does not exist", + errmsg("prepared transaction with gid \"%s\" does not exist", gid))); /* NOTREACHED */ |