Change xlog to WAL in some error messages

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 0a8edb9e5803bc0861768f97df145f4c9e64dbe5..5cefc43bfe3085bfb63a40a3144883ac085db57e 100644 (file)
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1259,13 +1259,13 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of memory"),
-                  errdetail("Failed while allocating an XLog reading processor.")));
+                  errdetail("Failed while allocating a WAL reading processor.")));
 
        record = XLogReadRecord(xlogreader, lsn, &errormsg);
        if (record == NULL)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("could not read two-phase state from xlog at %X/%X",
+                                errmsg("could not read two-phase state from WAL at %X/%X",
                                                (uint32) (lsn >> 32),
                                                (uint32) lsn)));
 
@@ -1273,7 +1273,7 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
                (XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("expected two-phase state data is not present in xlog at %X/%X",
+                                errmsg("expected two-phase state data is not present in WAL at %X/%X",
                                                (uint32) (lsn >> 32),
                                                (uint32) lsn)));
 

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 744360c769655194adc8f0ca55e85244fb9a2281..c0e5362928eed5905faa11ec24c4b9313e1ccc9a 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6315,7 +6315,7 @@ StartupXLOG(void)
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of memory"),
-                  errdetail("Failed while allocating an XLog reading processor.")));
+                  errdetail("Failed while allocating a WAL reading processor.")));
        xlogreader->system_identifier = ControlFile->system_identifier;
 
        /*
@@ -11246,8 +11246,8 @@ rm_redo_error_callback(void *arg)
        initStringInfo(&buf);
        xlog_outdesc(&buf, record);
 
-       /* translator: %s is an XLog record description */
-       errcontext("xlog redo at %X/%X for %s",
+       /* translator: %s is a WAL record description */
+       errcontext("WAL redo at %X/%X for %s",
                           (uint32) (record->ReadRecPtr >> 32),
                           (uint32) record->ReadRecPtr,
                           buf.data);

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 811ea5153b298b79c8cb08d7e635484aa0004a55..4feb26aa7a0a863b6cfc69bc48c15a0d50a10dd7 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1678,7 +1678,7 @@ static struct config_int ConfigureNamesInt[] =
 {
        {
                {"archive_timeout", PGC_SIGHUP, WAL_ARCHIVING,
-                       gettext_noop("Forces a switch to the next xlog file if a "
+                       gettext_noop("Forces a switch to the next WAL file if a "
                                                 "new file has not been started within N seconds."),
                        NULL,
                        GUC_UNIT_S