diff options
| author | Jan Wieck <JanWieck@Yahoo.com> | 2002-06-11 13:40:53 +0000 |
|---|---|---|
| committer | Jan Wieck <JanWieck@Yahoo.com> | 2002-06-11 13:40:53 +0000 |
| commit | 469cb65aca0307506886158be2fce9f4438f8361 (patch) | |
| tree | 2193a8dfc32a8b89bbd8babe01d7cdae8beb3e79 /src/backend/access/transam/xact.c | |
| parent | 3b993acf19f83b2e8fa0517fdb7b08dfe1ad9dd1 (diff) | |
Katherine Ward wrote:
> Changes to avoid collisions with WIN32 & MFC names...
> 1. Renamed:
> a. PROC => PGPROC
> b. GetUserName() => GetUserNameFromId()
> c. GetCurrentTime() => GetCurrentDateTime()
> d. IGNORE => IGNORE_DTF in include/utils/datetime.h & utils/adt/datetim
>
> 2. Added _P to some lex/yacc tokens:
> CONST, CHAR, DELETE, FLOAT, GROUP, IN, OUT
Jan
Diffstat (limited to 'src/backend/access/transam/xact.c')
| -rw-r--r-- | src/backend/access/transam/xact.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index f2a3caeabd9..0159295cf56 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.125 2002/05/25 20:00:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.126 2002/06/11 13:40:50 wieck Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -602,7 +602,7 @@ RecordTransactionCommit(void) MyLastRecPtr.xrecoff = 0; MyXactMadeXLogEntry = false; - /* Show myself as out of the transaction in PROC array */ + /* Show myself as out of the transaction in PGPROC array */ MyProc->logRec.xrecoff = 0; if (leak) @@ -727,7 +727,7 @@ RecordTransactionAbort(void) MyLastRecPtr.xrecoff = 0; MyXactMadeXLogEntry = false; - /* Show myself as out of the transaction in PROC array */ + /* Show myself as out of the transaction in PGPROC array */ MyProc->logRec.xrecoff = 0; /* @@ -960,7 +960,7 @@ CommitTransaction(void) * as running as well or it will see two tuple versions - one deleted * by xid 1 and one inserted by xid 0. See notes in GetSnapshotData. */ - if (MyProc != (PROC *) NULL) + if (MyProc != (PGPROC *) NULL) { /* Lock SInvalLock because that's what GetSnapshotData uses. */ LWLockAcquire(SInvalLock, LW_EXCLUSIVE); @@ -1069,7 +1069,7 @@ AbortTransaction(void) * this must be done _before_ releasing locks we hold and _after_ * RecordTransactionAbort. */ - if (MyProc != (PROC *) NULL) + if (MyProc != (PGPROC *) NULL) { /* Lock SInvalLock because that's what GetSnapshotData uses. */ LWLockAcquire(SInvalLock, LW_EXCLUSIVE); |