diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-06-29 19:19:29 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-06-29 19:23:28 +0300 |
| commit | 580bde7a1022aa93abbfb4db67a754a1da86b49c (patch) | |
| tree | 05812b7431c54785fda1ba4c876d0a8361eb573c /src/backend/access/transam/xlog.c | |
| parent | 38a90526a13670e56f22fba818362255ddaf52c2 (diff) | |
Initialize shared memory copy of ckptXidEpoch correctly when not in recovery.
This bug was introduced by commit 20d98ab6e4110087d1816cd105a40fcc8ce0a307,
so backpatch this to 9.0-9.2 like that one.
This fixes bug #6710, reported by Tarvi Pillessaar
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 3902c583134..0cab155fcfa 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5941,11 +5941,14 @@ StartupXLOG(void) ereport(PANIC, (errmsg("invalid next transaction ID"))); + /* initialize shared memory variables from the checkpoint record */ ShmemVariableCache->nextXid = checkPoint.nextXid; ShmemVariableCache->nextOid = checkPoint.nextOid; ShmemVariableCache->oidCount = 0; MultiXactSetNextMXact(checkPoint.nextMulti, checkPoint.nextMultiOffset); SetTransactionIdLimit(checkPoint.oldestXid, checkPoint.oldestXidDB); + XLogCtl->ckptXidEpoch = checkPoint.nextXidEpoch; + XLogCtl->ckptXid = checkPoint.nextXid; /* * We must replay WAL entries using the same TimeLineID they were created @@ -6022,10 +6025,6 @@ StartupXLOG(void) /* No need to hold ControlFileLock yet, we aren't up far enough */ UpdateControlFile(); - /* initialize shared-memory copy of latest checkpoint XID/epoch */ - XLogCtl->ckptXidEpoch = ControlFile->checkPointCopy.nextXidEpoch; - XLogCtl->ckptXid = ControlFile->checkPointCopy.nextXid; - /* initialize our local copy of minRecoveryPoint */ minRecoveryPoint = ControlFile->minRecoveryPoint; |