Teach pg_controldata and pg_resetxlog about the new backupEndRequired field

in control file.

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 2d52f784ae40777cd36bc364f3b2ed086d6682d7..9fafb7e8e76b5d86a1676d516bd353fff4572c0c 100644 (file)
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -232,6 +232,8 @@ main(int argc, char *argv[])
        printf(_("Backup start location:                %X/%X\n"),
                   ControlFile.backupStartPoint.xlogid,
                   ControlFile.backupStartPoint.xrecoff);
+       printf(_("End-of-backup record required:        %s\n"),
+                  ControlFile.backupEndRequired ? _("yes") : _("no"));
        printf(_("Current wal_level setting:            %s\n"),
                   wal_level_str(ControlFile.wal_level));
        printf(_("Current max_connections setting:      %d\n"),

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 1e1412d29db40f9b110b7c3780529319e5da62dd..5b8ae8814d50f14e16b82225e0ff4dc2a44e1d41 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -637,6 +637,7 @@ RewriteControlFile(void)
        ControlFile.minRecoveryPoint.xrecoff = 0;
        ControlFile.backupStartPoint.xlogid = 0;
        ControlFile.backupStartPoint.xrecoff = 0;
+       ControlFile.backupEndRequired = false;
 
        /*
         * Force the defaults for max_* settings. The values don't really matter