Fix bug introduced by the recent patch to check that the checkpoint redo

location read from backup label file can be found: wasShutdown was set
incorrectly when a backup label file was found.

Jeff Davis, with a little tweaking by me.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 794c0b5422fae9ab568161a7d2714d7592f06f9e..a8fdf4078095496e899c4b842354ce9c2b1cd3a4 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4424,6 +4424,7 @@ StartupXLOG(void)
                if (record != NULL)
                {
                        memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
+                       wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
                        ereport(LOG,
                                        (errmsg("checkpoint record is at %X/%X",
                                                        checkPointLoc.xlogid, checkPointLoc.xrecoff)));
@@ -4448,6 +4449,7 @@ StartupXLOG(void)
                        ereport(FATAL,
                                        (errmsg("could not locate required checkpoint record"),
                                         errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
+                       wasShutdown = false; /* keep compiler quiet */
                }
        }
        else
@@ -4480,10 +4482,10 @@ StartupXLOG(void)
                                         (errmsg("could not locate a valid checkpoint record")));
                }
                memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
+               wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
        }
 
        LastRec = RecPtr = checkPointLoc;
-       wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
 
        ereport(LOG,
         (errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",