aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2011-08-17 12:36:41 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2011-08-17 12:36:41 +0300
commita1a847d31f37b8063d8478b56e07856d53132b05 (patch)
tree5c046fa6d8c4f614559ffb16c699ffee55ec2f0e
parent1d0392b2457e0cb845ea498849541f7eb94616d7 (diff)
downloadpostgresql-a1a847d31f37b8063d8478b56e07856d53132b05.tar.gz
postgresql-a1a847d31f37b8063d8478b56e07856d53132b05.zip
Teach pg_controldata and pg_resetxlog about the new backupEndRequired field
in control file.
-rw-r--r--src/bin/pg_controldata/pg_controldata.c2
-rw-r--r--src/bin/pg_resetxlog/pg_resetxlog.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 2d52f784ae4..9fafb7e8e76 100644
--- 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 1e1412d29db..5b8ae8814d5 100644
--- 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