aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-02-08 09:08:51 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-02-08 09:08:51 +0000
commit4cea603128e53d47a8520b4f80332d95ec77589f (patch)
tree199f185a3c4d92dd2e75d76ec930bf2d86b7dec3
parent9a75803b1a4ba01c1e02284146fa7cf8a0cf8cd1 (diff)
downloadpostgresql-4cea603128e53d47a8520b4f80332d95ec77589f.tar.gz
postgresql-4cea603128e53d47a8520b4f80332d95ec77589f.zip
Remove piece of code to zero out minRecoveryPoint when starting crash
recovery. It's zeroed out whenever a checkpoint is written, so the only scenario where the removed code did anything is when you kill archive recovery, remove recovery.conf, and start up the server, so that it goes into crash recovery instead. That's a "don't do that" scenario, but it seems better to not clear minRecoveryPoint but instead update it like we do in archive recovery, which is what will now happen.
-rw-r--r--src/backend/access/transam/xlog.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 067827abeb6..4b429378dec 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.368 2010/02/08 04:33:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.369 2010/02/08 09:08:51 heikki Exp $
*
*-------------------------------------------------------------------------
*/
@@ -5656,11 +5656,6 @@ StartupXLOG(void)
if (XLByteLT(ControlFile->minRecoveryPoint, checkPoint.redo))
ControlFile->minRecoveryPoint = checkPoint.redo;
}
- else
- {
- XLogRecPtr InvalidXLogRecPtr = {0, 0};
- ControlFile->minRecoveryPoint = InvalidXLogRecPtr;
- }
/*
* set backupStartupPoint if we're starting archive recovery from a
* base backup