]> granicus.if.org Git - postgresql/blobdiff - src/bin/pg_resetxlog/pg_resetxlog.c
Properly check for readdir/closedir() failures
[postgresql] / src / bin / pg_resetxlog / pg_resetxlog.c
index 41b81ea894b647a012ae6c3768f8cbb5a3b46af3..af2cec7e932cd6d392b4968f84fa2831739843d0 100644 (file)
  * step 2 ...
  *
  *
- * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.20 2004/06/03 00:07:37 momjian Exp $
+ * src/bin/pg_resetxlog/pg_resetxlog.c
  *
  *-------------------------------------------------------------------------
  */
+
+/*
+ * We have to use postgres.h not postgres_fe.h here, because there's so much
+ * backend-only stuff in the XLOG include files we need.  But we need a
+ * frontend-ish environment otherwise. Hence this ugly hack.
+ */
+#define FRONTEND 1
+
 #include "postgres.h"
 
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
 #include <dirent.h>
+#include <fcntl.h>
 #include <locale.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
 
-#include "access/xlog.h"
+#include "access/transam.h"
+#include "access/tuptoaster.h"
+#include "access/multixact.h"
+#include "access/xlog_internal.h"
 #include "catalog/catversion.h"
 #include "catalog/pg_control.h"
+#include "common/fe_memutils.h"
+#include "pg_getopt.h"
 
-extern int     optind;
-extern char *optarg;
-
-#define _(x) gettext((x))
-
-
-/******************** stuff copied from xlog.c ********************/
-
-/* Increment an xlogid/segment pair */
-#define NextLogSeg(logId, logSeg)      \
-       do { \
-               if ((logSeg) >= XLogSegsPerFile-1) \
-               { \
-                       (logId)++; \
-                       (logSeg) = 0; \
-               } \
-               else \
-                       (logSeg)++; \
-       } while (0)
-
-#define XLogFileName(path, log, seg)   \
-                       snprintf(path, MAXPGPATH, "%s/%08X%08X",        \
-                                        XLogDir, log, seg)
-
-/******************** end of stuff copied from xlog.c ********************/
-
-static char XLogDir[MAXPGPATH];
-static char ControlFilePath[MAXPGPATH];
 
 static ControlFileData ControlFile;            /* pg_control values */
-static uint32 newXlogId,
-                       newXlogSeg;                     /* ID/Segment of new XLOG segment */
+static XLogSegNo newXlogSegNo; /* new XLOG segment # */
 static bool guessed = false;   /* T if we had to guess at any values */
 static const char *progname;
+static uint32 set_xid_epoch = (uint32) -1;
+static TransactionId set_xid = 0;
+static Oid     set_oid = 0;
+static MultiXactId set_mxid = 0;
+static MultiXactOffset set_mxoff = (MultiXactOffset) -1;
+static uint32 minXlogTli = 0;
+static XLogSegNo minXlogSegNo = 0;
 
 static bool ReadControlFile(void);
 static void GuessControlValues(void);
 static void PrintControlValues(bool guessed);
+static void PrintNewControlValues(void);
 static void RewriteControlFile(void);
+static void FindEndOfXLOG(void);
 static void KillExistingXLOG(void);
+static void KillExistingArchiveStatus(void);
 static void WriteEmptyXLOG(void);
 static void usage(void);
 
@@ -92,17 +85,13 @@ main(int argc, char *argv[])
        int                     c;
        bool            force = false;
        bool            noupdate = false;
-       TransactionId set_xid = 0;
-       Oid                     set_oid = 0;
-       uint32          minXlogId = 0,
-                               minXlogSeg = 0;
+       MultiXactId set_oldestmxid = 0;
        char       *endptr;
        char       *endptr2;
        char       *DataDir;
        int                     fd;
-       char            path[MAXPGPATH];
 
-       set_pglocale_pgservice(argv[0], "pg_resetxlog");
+       set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetxlog"));
 
        progname = get_progname(argv[0]);
 
@@ -121,7 +110,7 @@ main(int argc, char *argv[])
        }
 
 
-       while ((c = getopt(argc, argv, "fl:no:x:")) != -1)
+       while ((c = getopt(argc, argv, "fl:m:no:O:x:e:")) != -1)
        {
                switch (c)
                {
@@ -133,6 +122,21 @@ main(int argc, char *argv[])
                                noupdate = true;
                                break;
 
+                       case 'e':
+                               set_xid_epoch = strtoul(optarg, &endptr, 0);
+                               if (endptr == optarg || *endptr != '\0')
+                               {
+                                       fprintf(stderr, _("%s: invalid argument for option -e\n"), progname);
+                                       fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+                                       exit(1);
+                               }
+                               if (set_xid_epoch == -1)
+                               {
+                                       fprintf(stderr, _("%s: transaction ID epoch (-e) must not be -1\n"), progname);
+                                       exit(1);
+                               }
+                               break;
+
                        case 'x':
                                set_xid = strtoul(optarg, &endptr, 0);
                                if (endptr == optarg || *endptr != '\0')
@@ -163,21 +167,63 @@ main(int argc, char *argv[])
                                }
                                break;
 
-                       case 'l':
-                               minXlogId = strtoul(optarg, &endptr, 0);
+                       case 'm':
+                               set_mxid = strtoul(optarg, &endptr, 0);
                                if (endptr == optarg || *endptr != ',')
                                {
-                                       fprintf(stderr, _("%s: invalid argument for option -l\n"), progname);
+                                       fprintf(stderr, _("%s: invalid argument for option -m\n"), progname);
                                        fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
                                        exit(1);
                                }
-                               minXlogSeg = strtoul(endptr + 1, &endptr2, 0);
+
+                               set_oldestmxid = strtoul(endptr + 1, &endptr2, 0);
                                if (endptr2 == endptr + 1 || *endptr2 != '\0')
+                               {
+                                       fprintf(stderr, _("%s: invalid argument for option -m\n"), progname);
+                                       fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+                                       exit(1);
+                               }
+                               if (set_mxid == 0)
+                               {
+                                       fprintf(stderr, _("%s: multitransaction ID (-m) must not be 0\n"), progname);
+                                       exit(1);
+                               }
+
+                               /*
+                                * XXX It'd be nice to have more sanity checks here, e.g. so
+                                * that oldest is not wrapped around w.r.t. nextMulti.
+                                */
+                               if (set_oldestmxid == 0)
+                               {
+                                       fprintf(stderr, _("%s: oldest multitransaction ID (-m) must not be 0\n"),
+                                                       progname);
+                                       exit(1);
+                               }
+                               break;
+
+                       case 'O':
+                               set_mxoff = strtoul(optarg, &endptr, 0);
+                               if (endptr == optarg || *endptr != '\0')
+                               {
+                                       fprintf(stderr, _("%s: invalid argument for option -O\n"), progname);
+                                       fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+                                       exit(1);
+                               }
+                               if (set_mxoff == -1)
+                               {
+                                       fprintf(stderr, _("%s: multitransaction offset (-O) must not be -1\n"), progname);
+                                       exit(1);
+                               }
+                               break;
+
+                       case 'l':
+                               if (strspn(optarg, "01234567890ABCDEFabcdef") != 24)
                                {
                                        fprintf(stderr, _("%s: invalid argument for option -l\n"), progname);
                                        fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
                                        exit(1);
                                }
+                               XLogFromFileName(optarg, &minXlogTli, &minXlogSegNo);
                                break;
 
                        default:
@@ -193,22 +239,42 @@ main(int argc, char *argv[])
                exit(1);
        }
 
+       /*
+        * Don't allow pg_resetxlog to be run as root, to avoid overwriting the
+        * ownership of files in the data directory. We need only check for root
+        * -- any other user won't have sufficient permissions to modify files in
+        * the data directory.
+        */
+#ifndef WIN32
+       if (geteuid() == 0)
+       {
+               fprintf(stderr, _("%s: cannot be executed by \"root\"\n"),
+                               progname);
+               fprintf(stderr, _("You must run %s as the PostgreSQL superuser.\n"),
+                               progname);
+               exit(1);
+       }
+#endif
+
        DataDir = argv[optind];
-       snprintf(XLogDir, MAXPGPATH, "%s/pg_xlog", DataDir);
-       snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
+
+       if (chdir(DataDir) < 0)
+       {
+               fprintf(stderr, _("%s: could not change directory to \"%s\": %s\n"),
+                               progname, DataDir, strerror(errno));
+               exit(1);
+       }
 
        /*
         * Check for a postmaster lock file --- if there is one, refuse to
-        * proceed, on grounds we might be interfering with a live
-        * installation.
+        * proceed, on grounds we might be interfering with a live installation.
         */
-       snprintf(path, MAXPGPATH, "%s/postmaster.pid", DataDir);
-
-       if ((fd = open(path, O_RDONLY)) < 0)
+       if ((fd = open("postmaster.pid", O_RDONLY, 0)) < 0)
        {
                if (errno != ENOENT)
                {
-                       fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), progname, path, strerror(errno));
+                       fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
+                                       progname, "postmaster.pid", strerror(errno));
                        exit(1);
                }
        }
@@ -216,7 +282,7 @@ main(int argc, char *argv[])
        {
                fprintf(stderr, _("%s: lock file \"%s\" exists\n"
                                                  "Is a server running?  If not, delete the lock file and try again.\n"),
-                               progname, path);
+                               progname, "postmaster.pid");
                exit(1);
        }
 
@@ -227,30 +293,73 @@ main(int argc, char *argv[])
                GuessControlValues();
 
        /*
-        * Adjust fields if required by switches.  (Do this now so that
-        * printout, if any, includes these values.)
+        * Also look at existing segment files to set up newXlogSegNo
         */
+       FindEndOfXLOG();
+
+       /*
+        * If we're not going to proceed with the reset, print the current control
+        * file parameters.
+        */
+       if ((guessed && !force) || noupdate)
+               PrintControlValues(guessed);
+
+       /*
+        * Adjust fields if required by switches.  (Do this now so that printout,
+        * if any, includes these values.)
+        */
+       if (set_xid_epoch != -1)
+               ControlFile.checkPointCopy.nextXidEpoch = set_xid_epoch;
+
        if (set_xid != 0)
+       {
                ControlFile.checkPointCopy.nextXid = set_xid;
 
+               /*
+                * For the moment, just set oldestXid to a value that will force
+                * immediate autovacuum-for-wraparound.  It's not clear whether adding
+                * user control of this is useful, so let's just do something that's
+                * reasonably safe.  The magic constant here corresponds to the
+                * maximum allowed value of autovacuum_freeze_max_age.
+                */
+               ControlFile.checkPointCopy.oldestXid = set_xid - 2000000000;
+               if (ControlFile.checkPointCopy.oldestXid < FirstNormalTransactionId)
+                       ControlFile.checkPointCopy.oldestXid += FirstNormalTransactionId;
+               ControlFile.checkPointCopy.oldestXidDB = InvalidOid;
+       }
+
        if (set_oid != 0)
                ControlFile.checkPointCopy.nextOid = set_oid;
 
-       if (minXlogId > ControlFile.logId ||
-               (minXlogId == ControlFile.logId &&
-                minXlogSeg > ControlFile.logSeg))
+       if (set_mxid != 0)
        {
-               ControlFile.logId = minXlogId;
-               ControlFile.logSeg = minXlogSeg;
+               ControlFile.checkPointCopy.nextMulti = set_mxid;
+
+               ControlFile.checkPointCopy.oldestMulti = set_oldestmxid;
+               if (ControlFile.checkPointCopy.oldestMulti < FirstMultiXactId)
+                       ControlFile.checkPointCopy.oldestMulti += FirstMultiXactId;
+               ControlFile.checkPointCopy.oldestMultiDB = InvalidOid;
+       }
+
+       if (set_mxoff != -1)
+               ControlFile.checkPointCopy.nextMultiOffset = set_mxoff;
+
+       if (minXlogTli > ControlFile.checkPointCopy.ThisTimeLineID)
+       {
+               ControlFile.checkPointCopy.ThisTimeLineID = minXlogTli;
+               ControlFile.checkPointCopy.PrevTimeLineID = minXlogTli;
        }
 
+       if (minXlogSegNo > newXlogSegNo)
+               newXlogSegNo = minXlogSegNo;
+
        /*
         * If we had to guess anything, and -f was not given, just print the
         * guessed values and exit.  Also print if -n is given.
         */
        if ((guessed && !force) || noupdate)
        {
-               PrintControlValues(guessed);
+               PrintNewControlValues();
                if (!noupdate)
                {
                        printf(_("\nIf these values seem acceptable, use -f to force reset.\n"));
@@ -266,8 +375,8 @@ main(int argc, char *argv[])
        if (ControlFile.state != DB_SHUTDOWNED && !force)
        {
                printf(_("The database server was not shut down cleanly.\n"
-                        "Resetting the transaction log may cause data to be lost.\n"
-                        "If you want to proceed anyway, use -f to force reset.\n"));
+                          "Resetting the transaction log might cause data to be lost.\n"
+                                "If you want to proceed anyway, use -f to force reset.\n"));
                exit(1);
        }
 
@@ -276,6 +385,7 @@ main(int argc, char *argv[])
         */
        RewriteControlFile();
        KillExistingXLOG();
+       KillExistingArchiveStatus();
        WriteEmptyXLOG();
 
        printf(_("Transaction log reset\n"));
@@ -295,48 +405,48 @@ ReadControlFile(void)
        int                     fd;
        int                     len;
        char       *buffer;
-       crc64           crc;
+       pg_crc32        crc;
 
-       if ((fd = open(ControlFilePath, O_RDONLY)) < 0)
+       if ((fd = open(XLOG_CONTROL_FILE, O_RDONLY | PG_BINARY, 0)) < 0)
        {
                /*
-                * If pg_control is not there at all, or we can't read it, the
-                * odds are we've been handed a bad DataDir path, so give up. User
-                * can do "touch pg_control" to force us to proceed.
+                * If pg_control is not there at all, or we can't read it, the odds
+                * are we've been handed a bad DataDir path, so give up. User can do
+                * "touch pg_control" to force us to proceed.
                 */
                fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
-                               progname, ControlFilePath, strerror(errno));
+                               progname, XLOG_CONTROL_FILE, strerror(errno));
                if (errno == ENOENT)
                        fprintf(stderr, _("If you are sure the data directory path is correct, execute\n"
                                                          "  touch %s\n"
                                                          "and try again.\n"),
-                                       ControlFilePath);
+                                       XLOG_CONTROL_FILE);
                exit(1);
        }
 
        /* Use malloc to ensure we have a maxaligned buffer */
-       buffer = (char *) malloc(BLCKSZ);
+       buffer = (char *) pg_malloc(PG_CONTROL_SIZE);
 
-       len = read(fd, buffer, BLCKSZ);
+       len = read(fd, buffer, PG_CONTROL_SIZE);
        if (len < 0)
        {
                fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
-                               progname, ControlFilePath, strerror(errno));
+                               progname, XLOG_CONTROL_FILE, strerror(errno));
                exit(1);
        }
        close(fd);
 
        if (len >= sizeof(ControlFileData) &&
-               ((ControlFileData *) buffer)->pg_control_version == PG_CONTROL_VERSION)
+         ((ControlFileData *) buffer)->pg_control_version == PG_CONTROL_VERSION)
        {
                /* Check the CRC. */
-               INIT_CRC64(crc);
-               COMP_CRC64(crc,
-                                  buffer + sizeof(crc64),
-                                  sizeof(ControlFileData) - sizeof(crc64));
-               FIN_CRC64(crc);
+               INIT_CRC32(crc);
+               COMP_CRC32(crc,
+                                  buffer,
+                                  offsetof(ControlFileData, crc));
+               FIN_CRC32(crc);
 
-               if (EQ_CRC64(crc, ((ControlFileData *) buffer)->crc))
+               if (EQ_CRC32(crc, ((ControlFileData *) buffer)->crc))
                {
                        /* Valid data... */
                        memcpy(&ControlFile, buffer, sizeof(ControlFile));
@@ -366,7 +476,6 @@ GuessControlValues(void)
 {
        uint64          sysidentifier;
        struct timeval tv;
-       char       *localeptr;
 
        /*
         * Set up a completely default set of pg_control values.
@@ -378,8 +487,8 @@ GuessControlValues(void)
        ControlFile.catalog_version_no = CATALOG_VERSION_NO;
 
        /*
-        * Create a new unique installation identifier, since we can no longer
-        * use any old XLOG records.  See notes in xlog.c about the algorithm.
+        * Create a new unique installation identifier, since we can no longer use
+        * any old XLOG records.  See notes in xlog.c about the algorithm.
         */
        gettimeofday(&tv, NULL);
        sysidentifier = ((uint64) tv.tv_sec) << 32;
@@ -387,50 +496,56 @@ GuessControlValues(void)
 
        ControlFile.system_identifier = sysidentifier;
 
-       ControlFile.checkPointCopy.redo.xlogid = 0;
-       ControlFile.checkPointCopy.redo.xrecoff = SizeOfXLogPHD + SizeOfXLogRecord + SizeOfXLogFHD;
-       ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
-       ControlFile.checkPointCopy.ThisStartUpID = 0;
-       ControlFile.checkPointCopy.nextXid = (TransactionId) 514;       /* XXX */
-       ControlFile.checkPointCopy.nextOid = BootstrapObjectIdData;
-       ControlFile.checkPointCopy.time = time(NULL);
+       ControlFile.checkPointCopy.redo = SizeOfXLogLongPHD;
+       ControlFile.checkPointCopy.ThisTimeLineID = 1;
+       ControlFile.checkPointCopy.PrevTimeLineID = 1;
+       ControlFile.checkPointCopy.fullPageWrites = false;
+       ControlFile.checkPointCopy.nextXidEpoch = 0;
+       ControlFile.checkPointCopy.nextXid = FirstNormalTransactionId;
+       ControlFile.checkPointCopy.nextOid = FirstBootstrapObjectId;
+       ControlFile.checkPointCopy.nextMulti = FirstMultiXactId;
+       ControlFile.checkPointCopy.nextMultiOffset = 0;
+       ControlFile.checkPointCopy.oldestXid = FirstNormalTransactionId;
+       ControlFile.checkPointCopy.oldestXidDB = InvalidOid;
+       ControlFile.checkPointCopy.oldestMulti = FirstMultiXactId;
+       ControlFile.checkPointCopy.oldestMultiDB = InvalidOid;
+       ControlFile.checkPointCopy.time = (pg_time_t) time(NULL);
+       ControlFile.checkPointCopy.oldestActiveXid = InvalidTransactionId;
 
        ControlFile.state = DB_SHUTDOWNED;
-       ControlFile.time = time(NULL);
-       ControlFile.logId = 0;
-       ControlFile.logSeg = 1;
+       ControlFile.time = (pg_time_t) time(NULL);
        ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
+       ControlFile.unloggedLSN = 1;
+
+       /* minRecoveryPoint, backupStartPoint and backupEndPoint can be left zero */
 
+       ControlFile.wal_level = WAL_LEVEL_MINIMAL;
+       ControlFile.wal_log_hints = false;
+       ControlFile.MaxConnections = 100;
+       ControlFile.max_worker_processes = 8;
+       ControlFile.max_prepared_xacts = 0;
+       ControlFile.max_locks_per_xact = 64;
+
+       ControlFile.maxAlign = MAXIMUM_ALIGNOF;
+       ControlFile.floatFormat = FLOATFORMAT_VALUE;
        ControlFile.blcksz = BLCKSZ;
        ControlFile.relseg_size = RELSEG_SIZE;
+       ControlFile.xlog_blcksz = XLOG_BLCKSZ;
        ControlFile.xlog_seg_size = XLOG_SEG_SIZE;
        ControlFile.nameDataLen = NAMEDATALEN;
-       ControlFile.funcMaxArgs = FUNC_MAX_ARGS;
+       ControlFile.indexMaxKeys = INDEX_MAX_KEYS;
+       ControlFile.toast_max_chunk_size = TOAST_MAX_CHUNK_SIZE;
 #ifdef HAVE_INT64_TIMESTAMP
-       ControlFile.enableIntTimes = TRUE;
+       ControlFile.enableIntTimes = true;
 #else
-       ControlFile.enableIntTimes = FALSE;
+       ControlFile.enableIntTimes = false;
 #endif
-       ControlFile.localeBuflen = LOCALE_NAME_BUFLEN;
-
-       localeptr = setlocale(LC_COLLATE, "");
-       if (!localeptr)
-       {
-               fprintf(stderr, _("%s: invalid LC_COLLATE setting\n"), progname);
-               exit(1);
-       }
-       StrNCpy(ControlFile.lc_collate, localeptr, LOCALE_NAME_BUFLEN);
-       localeptr = setlocale(LC_CTYPE, "");
-       if (!localeptr)
-       {
-               fprintf(stderr, _("%s: invalid LC_CTYPE setting\n"), progname);
-               exit(1);
-       }
-       StrNCpy(ControlFile.lc_ctype, localeptr, LOCALE_NAME_BUFLEN);
+       ControlFile.float4ByVal = FLOAT4PASSBYVAL;
+       ControlFile.float8ByVal = FLOAT8PASSBYVAL;
 
        /*
-        * XXX eventually, should try to grovel through old XLOG to develop
-        * more accurate values for startupid, nextXID, and nextOID.
+        * XXX eventually, should try to grovel through old XLOG to develop more
+        * accurate values for TimeLineID, nextXID, etc.
         */
 }
 
@@ -449,7 +564,7 @@ PrintControlValues(bool guessed)
        if (guessed)
                printf(_("Guessed pg_control values:\n\n"));
        else
-               printf(_("pg_control values:\n\n"));
+               printf(_("Current pg_control values:\n\n"));
 
        /*
         * Format system_identifier separately to keep platform-dependent format
@@ -458,23 +573,114 @@ PrintControlValues(bool guessed)
        snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
                         ControlFile.system_identifier);
 
-       printf(_("pg_control version number:            %u\n"), ControlFile.pg_control_version);
-       printf(_("Catalog version number:               %u\n"), ControlFile.catalog_version_no);
-       printf(_("Database system identifier:           %s\n"), sysident_str);
-       printf(_("Current log file ID:                  %u\n"), ControlFile.logId);
-       printf(_("Next log file segment:                %u\n"), ControlFile.logSeg);
-       printf(_("Latest checkpoint's StartUpID:        %u\n"), ControlFile.checkPointCopy.ThisStartUpID);
-       printf(_("Latest checkpoint's NextXID:          %u\n"), ControlFile.checkPointCopy.nextXid);
-       printf(_("Latest checkpoint's NextOID:          %u\n"), ControlFile.checkPointCopy.nextOid);
-       printf(_("Database block size:                  %u\n"), ControlFile.blcksz);
-       printf(_("Blocks per segment of large relation: %u\n"), ControlFile.relseg_size);
-       printf(_("Maximum length of identifiers:        %u\n"), ControlFile.nameDataLen);
-       printf(_("Maximum number of function arguments: %u\n"), ControlFile.funcMaxArgs);
+       printf(_("pg_control version number:            %u\n"),
+                  ControlFile.pg_control_version);
+       printf(_("Catalog version number:               %u\n"),
+                  ControlFile.catalog_version_no);
+       printf(_("Database system identifier:           %s\n"),
+                  sysident_str);
+       printf(_("Latest checkpoint's TimeLineID:       %u\n"),
+                  ControlFile.checkPointCopy.ThisTimeLineID);
+       printf(_("Latest checkpoint's full_page_writes: %s\n"),
+                  ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off"));
+       printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
+                  ControlFile.checkPointCopy.nextXidEpoch,
+                  ControlFile.checkPointCopy.nextXid);
+       printf(_("Latest checkpoint's NextOID:          %u\n"),
+                  ControlFile.checkPointCopy.nextOid);
+       printf(_("Latest checkpoint's NextMultiXactId:  %u\n"),
+                  ControlFile.checkPointCopy.nextMulti);
+       printf(_("Latest checkpoint's NextMultiOffset:  %u\n"),
+                  ControlFile.checkPointCopy.nextMultiOffset);
+       printf(_("Latest checkpoint's oldestXID:        %u\n"),
+                  ControlFile.checkPointCopy.oldestXid);
+       printf(_("Latest checkpoint's oldestXID's DB:   %u\n"),
+                  ControlFile.checkPointCopy.oldestXidDB);
+       printf(_("Latest checkpoint's oldestActiveXID:  %u\n"),
+                  ControlFile.checkPointCopy.oldestActiveXid);
+       printf(_("Latest checkpoint's oldestMultiXid:   %u\n"),
+                  ControlFile.checkPointCopy.oldestMulti);
+       printf(_("Latest checkpoint's oldestMulti's DB: %u\n"),
+                  ControlFile.checkPointCopy.oldestMultiDB);
+       printf(_("Maximum data alignment:               %u\n"),
+                  ControlFile.maxAlign);
+       /* we don't print floatFormat since can't say much useful about it */
+       printf(_("Database block size:                  %u\n"),
+                  ControlFile.blcksz);
+       printf(_("Blocks per segment of large relation: %u\n"),
+                  ControlFile.relseg_size);
+       printf(_("WAL block size:                       %u\n"),
+                  ControlFile.xlog_blcksz);
+       printf(_("Bytes per WAL segment:                %u\n"),
+                  ControlFile.xlog_seg_size);
+       printf(_("Maximum length of identifiers:        %u\n"),
+                  ControlFile.nameDataLen);
+       printf(_("Maximum columns in an index:          %u\n"),
+                  ControlFile.indexMaxKeys);
+       printf(_("Maximum size of a TOAST chunk:        %u\n"),
+                  ControlFile.toast_max_chunk_size);
        printf(_("Date/time type storage:               %s\n"),
                   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
-       printf(_("Maximum length of locale name:        %u\n"), ControlFile.localeBuflen);
-       printf(_("LC_COLLATE:                           %s\n"), ControlFile.lc_collate);
-       printf(_("LC_CTYPE:                             %s\n"), ControlFile.lc_ctype);
+       printf(_("Float4 argument passing:              %s\n"),
+                  (ControlFile.float4ByVal ? _("by value") : _("by reference")));
+       printf(_("Float8 argument passing:              %s\n"),
+                  (ControlFile.float8ByVal ? _("by value") : _("by reference")));
+       printf(_("Data page checksum version:           %u\n"),
+                  ControlFile.data_checksum_version);
+}
+
+
+/*
+ * Print the values to be changed.
+ */
+static void
+PrintNewControlValues()
+{
+       char            fname[MAXFNAMELEN];
+
+       /* This will be always printed in order to keep format same. */
+       printf(_("\n\nValues to be changed:\n\n"));
+
+       XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID, newXlogSegNo);
+       printf(_("First log segment after reset:        %s\n"), fname);
+
+       if (set_mxid != 0)
+       {
+               printf(_("NextMultiXactId:                      %u\n"),
+                          ControlFile.checkPointCopy.nextMulti);
+               printf(_("OldestMultiXid:                       %u\n"),
+                          ControlFile.checkPointCopy.oldestMulti);
+               printf(_("OldestMulti's DB:                     %u\n"),
+                          ControlFile.checkPointCopy.oldestMultiDB);
+       }
+
+       if (set_mxoff != -1)
+       {
+               printf(_("NextMultiOffset:                      %u\n"),
+                          ControlFile.checkPointCopy.nextMultiOffset);
+       }
+
+       if (set_oid != 0)
+       {
+               printf(_("NextOID:                              %u\n"),
+                          ControlFile.checkPointCopy.nextOid);
+       }
+
+       if (set_xid != 0)
+       {
+               printf(_("NextXID:                              %u\n"),
+                          ControlFile.checkPointCopy.nextXid);
+               printf(_("OldestXID:                            %u\n"),
+                          ControlFile.checkPointCopy.oldestXid);
+               printf(_("OldestXID's DB:                       %u\n"),
+                          ControlFile.checkPointCopy.oldestXidDB);
+       }
+
+       if (set_xid_epoch != -1)
+       {
+               printf(_("NextXID Epoch:                        %u\n"),
+                          ControlFile.checkPointCopy.nextXidEpoch);
+       }
 }
 
 
@@ -485,67 +691,71 @@ static void
 RewriteControlFile(void)
 {
        int                     fd;
-       char            buffer[BLCKSZ]; /* need not be aligned */
+       char            buffer[PG_CONTROL_SIZE];                /* need not be aligned */
 
        /*
-        * Adjust fields as needed to force an empty XLOG starting at the next
-        * available segment.
+        * Adjust fields as needed to force an empty XLOG starting at
+        * newXlogSegNo.
         */
-       newXlogId = ControlFile.logId;
-       newXlogSeg = ControlFile.logSeg;
+       XLogSegNoOffsetToRecPtr(newXlogSegNo, SizeOfXLogLongPHD,
+                                                       ControlFile.checkPointCopy.redo);
+       ControlFile.checkPointCopy.time = (pg_time_t) time(NULL);
 
-       /* adjust in case we are changing segment size */
-       newXlogSeg *= ControlFile.xlog_seg_size;
-       newXlogSeg = (newXlogSeg + XLogSegSize-1) / XLogSegSize;
+       ControlFile.state = DB_SHUTDOWNED;
+       ControlFile.time = (pg_time_t) time(NULL);
+       ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
+       ControlFile.prevCheckPoint = 0;
+       ControlFile.minRecoveryPoint = 0;
+       ControlFile.minRecoveryPointTLI = 0;
+       ControlFile.backupStartPoint = 0;
+       ControlFile.backupEndPoint = 0;
+       ControlFile.backupEndRequired = false;
 
-       /* be sure we wrap around correctly at end of a logfile */
-       NextLogSeg(newXlogId, newXlogSeg);
+       /*
+        * Force the defaults for max_* settings. The values don't really matter
+        * as long as wal_level='minimal'; the postmaster will reset these fields
+        * anyway at startup.
+        */
+       ControlFile.wal_level = WAL_LEVEL_MINIMAL;
+       ControlFile.wal_log_hints = false;
+       ControlFile.MaxConnections = 100;
+       ControlFile.max_worker_processes = 8;
+       ControlFile.max_prepared_xacts = 0;
+       ControlFile.max_locks_per_xact = 64;
 
        /* Now we can force the recorded xlog seg size to the right thing. */
        ControlFile.xlog_seg_size = XLogSegSize;
 
-       ControlFile.checkPointCopy.redo.xlogid = newXlogId;
-       ControlFile.checkPointCopy.redo.xrecoff =
-               newXlogSeg * XLogSegSize + SizeOfXLogPHD + SizeOfXLogRecord + SizeOfXLogFHD;
-       ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
-       ControlFile.checkPointCopy.time = time(NULL);
-
-       ControlFile.state = DB_SHUTDOWNED;
-       ControlFile.time = time(NULL);
-       ControlFile.logId = newXlogId;
-       ControlFile.logSeg = newXlogSeg + 1;
-       ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
-       ControlFile.prevCheckPoint.xlogid = 0;
-       ControlFile.prevCheckPoint.xrecoff = 0;
-
        /* Contents are protected with a CRC */
-       INIT_CRC64(ControlFile.crc);
-       COMP_CRC64(ControlFile.crc,
-                          (char *) &ControlFile + sizeof(crc64),
-                          sizeof(ControlFileData) - sizeof(crc64));
-       FIN_CRC64(ControlFile.crc);
+       INIT_CRC32(ControlFile.crc);
+       COMP_CRC32(ControlFile.crc,
+                          (char *) &ControlFile,
+                          offsetof(ControlFileData, crc));
+       FIN_CRC32(ControlFile.crc);
 
        /*
-        * We write out BLCKSZ bytes into pg_control, zero-padding the excess
-        * over sizeof(ControlFileData).  This reduces the odds of
-        * premature-EOF errors when reading pg_control.  We'll still fail
-        * when we check the contents of the file, but hopefully with a more
-        * specific error than "couldn't read pg_control".
+        * We write out PG_CONTROL_SIZE bytes into pg_control, zero-padding the
+        * excess over sizeof(ControlFileData).  This reduces the odds of
+        * premature-EOF errors when reading pg_control.  We'll still fail when we
+        * check the contents of the file, but hopefully with a more specific
+        * error than "couldn't read pg_control".
         */
-       if (sizeof(ControlFileData) > BLCKSZ)
+       if (sizeof(ControlFileData) > PG_CONTROL_SIZE)
        {
                fprintf(stderr,
-                               _("%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"),
+                               _("%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"),
                                progname);
                exit(1);
        }
 
-       memset(buffer, 0, BLCKSZ);
+       memset(buffer, 0, PG_CONTROL_SIZE);
        memcpy(buffer, &ControlFile, sizeof(ControlFileData));
 
-       unlink(ControlFilePath);
+       unlink(XLOG_CONTROL_FILE);
 
-       fd = open(ControlFilePath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, S_IRUSR | S_IWUSR);
+       fd = open(XLOG_CONTROL_FILE,
+                         O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
+                         S_IRUSR | S_IWUSR);
        if (fd < 0)
        {
                fprintf(stderr, _("%s: could not create pg_control file: %s\n"),
@@ -554,7 +764,7 @@ RewriteControlFile(void)
        }
 
        errno = 0;
-       if (write(fd, buffer, BLCKSZ) != BLCKSZ)
+       if (write(fd, buffer, PG_CONTROL_SIZE) != PG_CONTROL_SIZE)
        {
                /* if write didn't set errno, assume problem is no disk space */
                if (errno == 0)
@@ -574,6 +784,97 @@ RewriteControlFile(void)
 }
 
 
+/*
+ * Scan existing XLOG files and determine the highest existing WAL address
+ *
+ * On entry, ControlFile.checkPointCopy.redo and ControlFile.xlog_seg_size
+ * are assumed valid (note that we allow the old xlog seg size to differ
+ * from what we're using).  On exit, newXlogId and newXlogSeg are set to
+ * suitable values for the beginning of replacement WAL (in our seg size).
+ */
+static void
+FindEndOfXLOG(void)
+{
+       DIR                *xldir;
+       struct dirent *xlde;
+       uint64          segs_per_xlogid;
+       uint64          xlogbytepos;
+
+       /*
+        * Initialize the max() computation using the last checkpoint address from
+        * old pg_control.      Note that for the moment we are working with segment
+        * numbering according to the old xlog seg size.
+        */
+       segs_per_xlogid = (UINT64CONST(0x0000000100000000) / ControlFile.xlog_seg_size);
+       newXlogSegNo = ControlFile.checkPointCopy.redo / ControlFile.xlog_seg_size;
+
+       /*
+        * Scan the pg_xlog directory to find existing WAL segment files. We
+        * assume any present have been used; in most scenarios this should be
+        * conservative, because of xlog.c's attempts to pre-create files.
+        */
+       xldir = opendir(XLOGDIR);
+       if (xldir == NULL)
+       {
+               fprintf(stderr, _("%s: could not open directory \"%s\": %s\n"),
+                               progname, XLOGDIR, strerror(errno));
+               exit(1);
+       }
+
+       while (errno = 0, (xlde = readdir(xldir)) != NULL)
+       {
+               if (strlen(xlde->d_name) == 24 &&
+                       strspn(xlde->d_name, "0123456789ABCDEF") == 24)
+               {
+                       unsigned int tli,
+                                               log,
+                                               seg;
+                       XLogSegNo       segno;
+
+                       sscanf(xlde->d_name, "%08X%08X%08X", &tli, &log, &seg);
+                       segno = ((uint64) log) * segs_per_xlogid + seg;
+
+                       /*
+                        * Note: we take the max of all files found, regardless of their
+                        * timelines.  Another possibility would be to ignore files of
+                        * timelines other than the target TLI, but this seems safer.
+                        * Better too large a result than too small...
+                        */
+                       if (segno > newXlogSegNo)
+                               newXlogSegNo = segno;
+               }
+       }
+
+#ifdef WIN32
+       /* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
+       if (GetLastError() == ERROR_NO_MORE_FILES)
+               errno = 0;
+#endif
+
+       if (errno)
+       {
+               fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
+                               progname, XLOGDIR, strerror(errno));
+               exit(1);
+       }
+
+       if (closedir(xldir))
+       {
+               fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"),
+                               progname, XLOGDIR, strerror(errno));
+               exit(1);
+       }
+
+       /*
+        * Finally, convert to new xlog seg size, and advance by one to ensure we
+        * are in virgin territory.
+        */
+       xlogbytepos = newXlogSegNo * ControlFile.xlog_seg_size;
+       newXlogSegNo = (xlogbytepos + XLogSegSize - 1) / XLogSegSize;
+       newXlogSegNo++;
+}
+
+
 /*
  * Remove existing XLOG files
  */
@@ -584,21 +885,20 @@ KillExistingXLOG(void)
        struct dirent *xlde;
        char            path[MAXPGPATH];
 
-       xldir = opendir(XLogDir);
+       xldir = opendir(XLOGDIR);
        if (xldir == NULL)
        {
                fprintf(stderr, _("%s: could not open directory \"%s\": %s\n"),
-                               progname, XLogDir, strerror(errno));
+                               progname, XLOGDIR, strerror(errno));
                exit(1);
        }
 
-       errno = 0;
-       while ((xlde = readdir(xldir)) != NULL)
+       while (errno = 0, (xlde = readdir(xldir)) != NULL)
        {
-               if (strlen(xlde->d_name) == 16 &&
-                       strspn(xlde->d_name, "0123456789ABCDEF") == 16)
+               if (strlen(xlde->d_name) == 24 &&
+                       strspn(xlde->d_name, "0123456789ABCDEF") == 24)
                {
-                       snprintf(path, MAXPGPATH, "%s/%s", XLogDir, xlde->d_name);
+                       snprintf(path, MAXPGPATH, "%s/%s", XLOGDIR, xlde->d_name);
                        if (unlink(path) < 0)
                        {
                                fprintf(stderr, _("%s: could not delete file \"%s\": %s\n"),
@@ -606,22 +906,85 @@ KillExistingXLOG(void)
                                exit(1);
                        }
                }
+       }
+
+#ifdef WIN32
+       /* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
+       if (GetLastError() == ERROR_NO_MORE_FILES)
                errno = 0;
+#endif
+
+       if (errno)
+       {
+               fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
+                               progname, XLOGDIR, strerror(errno));
+               exit(1);
        }
+
+       if (closedir(xldir))
+       {
+               fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"),
+                               progname, XLOGDIR, strerror(errno));
+               exit(1);
+       }
+}
+
+
+/*
+ * Remove existing archive status files
+ */
+static void
+KillExistingArchiveStatus(void)
+{
+       DIR                *xldir;
+       struct dirent *xlde;
+       char            path[MAXPGPATH];
+
+#define ARCHSTATDIR XLOGDIR "/archive_status"
+
+       xldir = opendir(ARCHSTATDIR);
+       if (xldir == NULL)
+       {
+               fprintf(stderr, _("%s: could not open directory \"%s\": %s\n"),
+                               progname, ARCHSTATDIR, strerror(errno));
+               exit(1);
+       }
+
+       while (errno = 0, (xlde = readdir(xldir)) != NULL)
+       {
+               if (strspn(xlde->d_name, "0123456789ABCDEF") == 24 &&
+                       (strcmp(xlde->d_name + 24, ".ready") == 0 ||
+                        strcmp(xlde->d_name + 24, ".done") == 0))
+               {
+                       snprintf(path, MAXPGPATH, "%s/%s", ARCHSTATDIR, xlde->d_name);
+                       if (unlink(path) < 0)
+                       {
+                               fprintf(stderr, _("%s: could not delete file \"%s\": %s\n"),
+                                               progname, path, strerror(errno));
+                               exit(1);
+                       }
+               }
+       }
+
 #ifdef WIN32
-       /* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but
-          not in released version */
+       /* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
        if (GetLastError() == ERROR_NO_MORE_FILES)
                errno = 0;
 #endif
 
        if (errno)
        {
-               fprintf(stderr, _("%s: could not read from directory \"%s\": %s\n"),
-                               progname, XLogDir, strerror(errno));
+               fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
+                               progname, ARCHSTATDIR, strerror(errno));
+               exit(1);
+       }
+
+       if (closedir(xldir))
+       {
+               fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"),
+                               progname, ARCHSTATDIR, strerror(errno));
                exit(1);
        }
-       closedir(xldir);
 }
 
 
@@ -634,73 +997,47 @@ WriteEmptyXLOG(void)
 {
        char       *buffer;
        XLogPageHeader page;
+       XLogLongPageHeader longpage;
        XLogRecord *record;
-       XLogFileHeaderData *fhdr;
-       crc64           crc;
+       pg_crc32        crc;
        char            path[MAXPGPATH];
        int                     fd;
        int                     nbytes;
 
        /* Use malloc() to ensure buffer is MAXALIGNED */
-       buffer = (char *) malloc(BLCKSZ);
+       buffer = (char *) pg_malloc(XLOG_BLCKSZ);
        page = (XLogPageHeader) buffer;
-       memset(buffer, 0, BLCKSZ);
+       memset(buffer, 0, XLOG_BLCKSZ);
 
        /* Set up the XLOG page header */
        page->xlp_magic = XLOG_PAGE_MAGIC;
-       page->xlp_info = 0;
-       page->xlp_sui = ControlFile.checkPointCopy.ThisStartUpID;
-       page->xlp_pageaddr.xlogid =
-               ControlFile.checkPointCopy.redo.xlogid;
-       page->xlp_pageaddr.xrecoff =
-               ControlFile.checkPointCopy.redo.xrecoff -
-               (SizeOfXLogPHD + SizeOfXLogRecord + SizeOfXLogFHD);
-
-       /* Insert the file header record */
-       record = (XLogRecord *) ((char *) page + SizeOfXLogPHD);
-       record->xl_prev.xlogid = 0;
-       record->xl_prev.xrecoff = 0;
-       record->xl_xact_prev.xlogid = 0;
-       record->xl_xact_prev.xrecoff = 0;
-       record->xl_xid = InvalidTransactionId;
-       record->xl_len = SizeOfXLogFHD;
-       record->xl_info = XLOG_FILE_HEADER;
-       record->xl_rmid = RM_XLOG_ID;
-       fhdr = (XLogFileHeaderData *) XLogRecGetData(record);
-       fhdr->xlfhd_sysid = ControlFile.system_identifier;
-       fhdr->xlfhd_xlogid = page->xlp_pageaddr.xlogid;
-       fhdr->xlfhd_segno = page->xlp_pageaddr.xrecoff / XLogSegSize;
-       fhdr->xlfhd_seg_size = XLogSegSize;
-
-       INIT_CRC64(crc);
-       COMP_CRC64(crc, fhdr, SizeOfXLogFHD);
-       COMP_CRC64(crc, (char *) record + sizeof(crc64),
-                          SizeOfXLogRecord - sizeof(crc64));
-       FIN_CRC64(crc);
-       record->xl_crc = crc;
+       page->xlp_info = XLP_LONG_HEADER;
+       page->xlp_tli = ControlFile.checkPointCopy.ThisTimeLineID;
+       page->xlp_pageaddr = ControlFile.checkPointCopy.redo - SizeOfXLogLongPHD;
+       longpage = (XLogLongPageHeader) page;
+       longpage->xlp_sysid = ControlFile.system_identifier;
+       longpage->xlp_seg_size = XLogSegSize;
+       longpage->xlp_xlog_blcksz = XLOG_BLCKSZ;
 
        /* Insert the initial checkpoint record */
-       record = (XLogRecord *) ((char *) page + SizeOfXLogPHD + SizeOfXLogRecord + SizeOfXLogFHD);
-       record->xl_prev.xlogid = page->xlp_pageaddr.xlogid;
-       record->xl_prev.xrecoff = page->xlp_pageaddr.xrecoff + SizeOfXLogPHD;
-       record->xl_xact_prev.xlogid = 0;
-       record->xl_xact_prev.xrecoff = 0;
+       record = (XLogRecord *) ((char *) page + SizeOfXLogLongPHD);
+       record->xl_prev = 0;
        record->xl_xid = InvalidTransactionId;
+       record->xl_tot_len = SizeOfXLogRecord + sizeof(CheckPoint);
        record->xl_len = sizeof(CheckPoint);
        record->xl_info = XLOG_CHECKPOINT_SHUTDOWN;
        record->xl_rmid = RM_XLOG_ID;
        memcpy(XLogRecGetData(record), &ControlFile.checkPointCopy,
                   sizeof(CheckPoint));
 
-       INIT_CRC64(crc);
-       COMP_CRC64(crc, &ControlFile.checkPointCopy, sizeof(CheckPoint));
-       COMP_CRC64(crc, (char *) record + sizeof(crc64),
-                          SizeOfXLogRecord - sizeof(crc64));
-       FIN_CRC64(crc);
+       INIT_CRC32(crc);
+       COMP_CRC32(crc, &ControlFile.checkPointCopy, sizeof(CheckPoint));
+       COMP_CRC32(crc, (char *) record, offsetof(XLogRecord, xl_crc));
+       FIN_CRC32(crc);
        record->xl_crc = crc;
 
        /* Write the first page */
-       XLogFileName(path, newXlogId, newXlogSeg);
+       XLogFilePath(path, ControlFile.checkPointCopy.ThisTimeLineID, newXlogSegNo);
 
        unlink(path);
 
@@ -714,7 +1051,7 @@ WriteEmptyXLOG(void)
        }
 
        errno = 0;
-       if (write(fd, buffer, BLCKSZ) != BLCKSZ)
+       if (write(fd, buffer, XLOG_BLCKSZ) != XLOG_BLCKSZ)
        {
                /* if write didn't set errno, assume problem is no disk space */
                if (errno == 0)
@@ -725,11 +1062,11 @@ WriteEmptyXLOG(void)
        }
 
        /* Fill the rest of the file with zeroes */
-       memset(buffer, 0, BLCKSZ);
-       for (nbytes = BLCKSZ; nbytes < XLogSegSize; nbytes += BLCKSZ)
+       memset(buffer, 0, XLOG_BLCKSZ);
+       for (nbytes = XLOG_BLCKSZ; nbytes < XLogSegSize; nbytes += XLOG_BLCKSZ)
        {
                errno = 0;
-               if (write(fd, buffer, BLCKSZ) != BLCKSZ)
+               if (write(fd, buffer, XLOG_BLCKSZ) != XLOG_BLCKSZ)
                {
                        if (errno == 0)
                                errno = ENOSPC;
@@ -755,12 +1092,15 @@ usage(void)
        printf(_("%s resets the PostgreSQL transaction log.\n\n"), progname);
        printf(_("Usage:\n  %s [OPTION]... DATADIR\n\n"), progname);
        printf(_("Options:\n"));
-       printf(_("  -f              force update to be done\n"));
-       printf(_("  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"));
-       printf(_("  -n              no update, just show extracted control values (for testing)\n"));
-       printf(_("  -o OID          set next OID\n"));
-       printf(_("  -x XID          set next transaction ID\n"));
-       printf(_("  --help          show this help, then exit\n"));
-       printf(_("  --version       output version information, then exit\n"));
+       printf(_("  -e XIDEPOCH      set next transaction ID epoch\n"));
+       printf(_("  -f               force update to be done\n"));
+       printf(_("  -l XLOGFILE      force minimum WAL starting location for new transaction log\n"));
+       printf(_("  -m MXID,MXID     set next and oldest multitransaction ID\n"));
+       printf(_("  -n               no update, just show what would be done (for testing)\n"));
+       printf(_("  -o OID           set next OID\n"));
+       printf(_("  -O OFFSET        set next multitransaction offset\n"));
+       printf(_("  -V, --version    output version information, then exit\n"));
+       printf(_("  -x XID           set next transaction ID\n"));
+       printf(_("  -?, --help       show this help, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }