diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-10-13 22:55:55 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-10-13 22:55:55 +0000 |
| commit | 1d028537a2c28dcd7b8cf064bcc7b5621a4db83b (patch) | |
| tree | f0443c7e4987ce8196c90dcba3c17ac9c4ea9e17 /src | |
| parent | 5aae047e239c19264b61323865e8a4a1eae3e5f8 (diff) | |
| download | postgresql-1d028537a2c28dcd7b8cf064bcc7b5621a4db83b.tar.gz postgresql-1d028537a2c28dcd7b8cf064bcc7b5621a4db83b.zip | |
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')
| -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 2c7f400b71d..05590da14ed 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.13 2005/10/13 17:57:57 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.14 2005/10/13 22:55:55 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("global transaction identifier \"%s\" is too long", + errmsg("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("global transaction identifier \"%s\" is already in use", + errmsg("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 gid \"%s\" is busy", + errmsg("prepared transaction with identifier \"%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 gid \"%s\" does not exist", + errmsg("prepared transaction with identifier \"%s\" does not exist", gid))); /* NOTREACHED */ |