diff options
author | Vadim B. Mikheev <vadim4o@yahoo.com> | 2000-11-03 11:39:36 +0000 |
---|---|---|
committer | Vadim B. Mikheev <vadim4o@yahoo.com> | 2000-11-03 11:39:36 +0000 |
commit | b98ba2a04c07c451cb26a6865d7a9fae4659261d (patch) | |
tree | ad201f1cebfe062d1c7452869320236a67462b06 /src/backend/access/transam/transam.c | |
parent | b703c127ed8b287b6fb32390e81f0be8e8c139fa (diff) | |
download | postgresql-b98ba2a04c07c451cb26a6865d7a9fae4659261d.tar.gz postgresql-b98ba2a04c07c451cb26a6865d7a9fae4659261d.zip |
pg_variable is not used in WAL version now.
Diffstat (limited to 'src/backend/access/transam/transam.c')
-rw-r--r-- | src/backend/access/transam/transam.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 52a3906ba69..b56dcd0c50f 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.35 2000/08/03 19:18:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.36 2000/11/03 11:39:35 vadim Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -83,6 +83,10 @@ int RecoveryCheckingEnableState = 0; */ extern int OidGenLockId; +#ifdef XLOG +#include "miscadmin.h" +extern VariableCache ShmemVariableCache; +#endif /* ---------------- * recovery checking accessors @@ -438,7 +442,13 @@ InitializeTransactionLog(void) TransactionLogUpdate(AmiTransactionId, XID_COMMIT); TransactionIdStore(AmiTransactionId, &cachedTestXid); cachedTestXidStatus = XID_COMMIT; +#ifdef XLOG + Assert(!IsUnderPostmaster && + ShmemVariableCache->nextXid <= FirstTransactionId); + ShmemVariableCache->nextXid = FirstTransactionId; +#else VariableRelationPutNextXid(FirstTransactionId); +#endif } else if (RecoveryCheckingEnabled()) |