77 * Portions Copyright (c) 1994, Regents of the University of California
88 *
99 * IDENTIFICATION
10- *$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.13 2005/10/1317:57:57 momjian Exp $
10+ *$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.14 2005/10/1322:55:55 momjian Exp $
1111 *
1212 * NOTES
1313 *Each global transaction is associated with a global transaction
@@ -221,7 +221,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
221221if (strlen (gid ) >=GIDSIZE )
222222ereport (ERROR ,
223223(errcode (ERRCODE_INVALID_PARAMETER_VALUE ),
224- errmsg ("global transaction identifier \"%s\" is too long" ,
224+ errmsg ("transaction identifier \"%s\" is too long" ,
225225gid )));
226226
227227LWLockAcquire (TwoPhaseStateLock ,LW_EXCLUSIVE );
@@ -256,7 +256,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
256256{
257257ereport (ERROR ,
258258(errcode (ERRCODE_DUPLICATE_OBJECT ),
259- errmsg ("global transaction identifier \"%s\" is already in use" ,
259+ errmsg ("transaction identifier \"%s\" is already in use" ,
260260gid )));
261261}
262262}
@@ -380,7 +380,7 @@ LockGXact(const char *gid, Oid user)
380380if (TransactionIdIsActive (gxact -> locking_xid ))
381381ereport (ERROR ,
382382(errcode (ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE ),
383- errmsg ("prepared transaction withgid \"%s\" is busy" ,
383+ errmsg ("prepared transaction withidentifier \"%s\" is busy" ,
384384gid )));
385385gxact -> locking_xid = InvalidTransactionId ;
386386}
@@ -403,7 +403,7 @@ LockGXact(const char *gid, Oid user)
403403
404404ereport (ERROR ,
405405(errcode (ERRCODE_UNDEFINED_OBJECT ),
406- errmsg ("prepared transaction withgid \"%s\" does not exist" ,
406+ errmsg ("prepared transaction withidentifier \"%s\" does not exist" ,
407407gid )));
408408
409409/* NOTREACHED */