postgres.git / summary / log / commit / refs

commit    2877c67bc24510c30bca477c876f5de427c85588
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Tue Aug 16 09:21:50 2011 +0000
First released in: 9.2.0

    Fix bogus comment that claimed that the new BACKUP METHOD line in
    backup_label was new in 9.0. Spotted by Fujii Masao.


 src/backend/access/transam/xlog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 11035e6b4cd..a462288a9ce 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9826,9 +9826,9 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired)
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE)));
 	/*
-	 * BACKUP METHOD line is new in 9.0. Don't complain if it doesn't exist,
-	 * in case you're restoring from a backup taken with an 9.0 beta version
-	 * that didn't emit it.
+	 * BACKUP METHOD line is new in 9.2. We can't restore from an older backup
+	 * anyway, but since the information on it is not strictly required, don't
+	 * error out if it's missing for some reason.
 	 */
 	if (fscanf(lfp, "BACKUP METHOD: %19s", backuptype) == 1)
 	{


[parent: 3b3f09351b48]