Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit84cc9a4

Browse files
committed
Back out this because of fear of changing error strings:
This makes the error messages for PREPARE TRANSACTION, COMMIT PREPAREDetc. match the docs, which talk about "transaction identifier" not"gid" or "global transaction identifier".Steve Woodcock
1 parent90c22c9 commit84cc9a4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

‎src/backend/access/transam/twophase.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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.12 2005/10/13 17:57:17 momjian Exp $
10+
*$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.13 2005/10/13 17:57:57 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,
221221
if (strlen(gid) >=GIDSIZE)
222222
ereport(ERROR,
223223
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
224-
errmsg("transaction identifier \"%s\" is too long",
224+
errmsg("globaltransaction identifier \"%s\" is too long",
225225
gid)));
226226

227227
LWLockAcquire(TwoPhaseStateLock,LW_EXCLUSIVE);
@@ -256,7 +256,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
256256
{
257257
ereport(ERROR,
258258
(errcode(ERRCODE_DUPLICATE_OBJECT),
259-
errmsg("transaction identifier \"%s\" is already in use",
259+
errmsg("globaltransaction identifier \"%s\" is already in use",
260260
gid)));
261261
}
262262
}
@@ -380,7 +380,7 @@ LockGXact(const char *gid, Oid user)
380380
if (TransactionIdIsActive(gxact->locking_xid))
381381
ereport(ERROR,
382382
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
383-
errmsg("prepared transaction withidentifier \"%s\" is busy",
383+
errmsg("prepared transaction withgid \"%s\" is busy",
384384
gid)));
385385
gxact->locking_xid=InvalidTransactionId;
386386
}
@@ -403,7 +403,7 @@ LockGXact(const char *gid, Oid user)
403403

404404
ereport(ERROR,
405405
(errcode(ERRCODE_UNDEFINED_OBJECT),
406-
errmsg("prepared transaction withidentifier \"%s\" does not exist",
406+
errmsg("prepared transaction withgid \"%s\" does not exist",
407407
gid)));
408408

409409
/* NOTREACHED */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp