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

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 6036f995d473d7364389615913002f94f06007f2..7c8ea844cc38137a6606d3c9742bdebab8e4f0cc 100644 (file)
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -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 */