Mark some untranslatable messages with errmsg_internal

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 72cafc166acfd9546c8557d232df2eba5741bdfb..7d665450178f1148068c765e86fbbdb1458654cb 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5306,22 +5306,22 @@ readRecoveryCommandFile(void)
        {
            recoveryRestoreCommand = pstrdup(item->value);
            ereport(DEBUG2,
-                   (errmsg("restore_command = '%s'",
-                           recoveryRestoreCommand)));
+                   (errmsg_internal("restore_command = '%s'",
+                                    recoveryRestoreCommand)));
        }
        else if (strcmp(item->name, "recovery_end_command") == 0)
        {
            recoveryEndCommand = pstrdup(item->value);
            ereport(DEBUG2,
-                   (errmsg("recovery_end_command = '%s'",
-                           recoveryEndCommand)));
+                   (errmsg_internal("recovery_end_command = '%s'",
+                                    recoveryEndCommand)));
        }
        else if (strcmp(item->name, "archive_cleanup_command") == 0)
        {
            archiveCleanupCommand = pstrdup(item->value);
            ereport(DEBUG2,
-                   (errmsg("archive_cleanup_command = '%s'",
-                           archiveCleanupCommand)));
+                   (errmsg_internal("archive_cleanup_command = '%s'",
+                                    archiveCleanupCommand)));
        }
        else if (strcmp(item->name, "pause_at_recovery_target") == 0)
        {
@@ -5330,7 +5330,8 @@ readRecoveryCommandFile(void)
                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                         errmsg("parameter \"%s\" requires a Boolean value", "pause_at_recovery_target")));
            ereport(DEBUG2,
-                   (errmsg("pause_at_recovery_target = '%s'", item->value)));
+                   (errmsg_internal("pause_at_recovery_target = '%s'",
+                                    item->value)));
        }
        else if (strcmp(item->name, "recovery_target_timeline") == 0)
        {
@@ -5348,10 +5349,10 @@ readRecoveryCommandFile(void)
            }
            if (rtli)
                ereport(DEBUG2,
-                       (errmsg("recovery_target_timeline = %u", rtli)));
+                       (errmsg_internal("recovery_target_timeline = %u", rtli)));
            else
                ereport(DEBUG2,
-                       (errmsg("recovery_target_timeline = latest")));
+                       (errmsg_internal("recovery_target_timeline = latest")));
        }
        else if (strcmp(item->name, "recovery_target_xid") == 0)
        {
@@ -5362,8 +5363,8 @@ readRecoveryCommandFile(void)
                 (errmsg("recovery_target_xid is not a valid number: \"%s\"",
                         item->value)));
            ereport(DEBUG2,
-                   (errmsg("recovery_target_xid = %u",
-                           recoveryTargetXid)));
+                   (errmsg_internal("recovery_target_xid = %u",
+                                    recoveryTargetXid)));
            recoveryTarget = RECOVERY_TARGET_XID;
        }
        else if (strcmp(item->name, "recovery_target_time") == 0)
@@ -5386,8 +5387,8 @@ readRecoveryCommandFile(void)
                                                ObjectIdGetDatum(InvalidOid),
                                                        Int32GetDatum(-1)));
            ereport(DEBUG2,
-                   (errmsg("recovery_target_time = '%s'",
-                           timestamptz_to_str(recoveryTargetTime))));
+                   (errmsg_internal("recovery_target_time = '%s'",
+                                    timestamptz_to_str(recoveryTargetTime))));
        }
        else if (strcmp(item->name, "recovery_target_name") == 0)
        {
@@ -5403,11 +5404,12 @@ readRecoveryCommandFile(void)
            if (strlen(recoveryTargetName) >= MAXFNAMELEN)
                ereport(FATAL,
                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                        errmsg("recovery_target_name is too long (maximum %d characters)", MAXFNAMELEN - 1)));
+                        errmsg("recovery_target_name is too long (maximum %d characters)",
+                               MAXFNAMELEN - 1)));
 
            ereport(DEBUG2,
-                   (errmsg("recovery_target_name = '%s'",
-                           recoveryTargetName)));
+                   (errmsg_internal("recovery_target_name = '%s'",
+                                    recoveryTargetName)));
        }
        else if (strcmp(item->name, "recovery_target_inclusive") == 0)
        {
@@ -5417,32 +5419,35 @@ readRecoveryCommandFile(void)
            if (!parse_bool(item->value, &recoveryTargetInclusive))
                ereport(ERROR,
                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                        errmsg("parameter \"%s\" requires a Boolean value", "recovery_target_inclusive")));
+                        errmsg("parameter \"%s\" requires a Boolean value",
+                               "recovery_target_inclusive")));
            ereport(DEBUG2,
-                   (errmsg("recovery_target_inclusive = %s", item->value)));
+                   (errmsg_internal("recovery_target_inclusive = %s",
+                                    item->value)));
        }
        else if (strcmp(item->name, "standby_mode") == 0)
        {
            if (!parse_bool(item->value, &StandbyMode))
                ereport(ERROR,
                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                        errmsg("parameter \"%s\" requires a Boolean value", "standby_mode")));
+                        errmsg("parameter \"%s\" requires a Boolean value",
+                               "standby_mode")));
            ereport(DEBUG2,
-                   (errmsg("standby_mode = '%s'", item->value)));
+                   (errmsg_internal("standby_mode = '%s'", item->value)));
        }
        else if (strcmp(item->name, "primary_conninfo") == 0)
        {
            PrimaryConnInfo = pstrdup(item->value);
            ereport(DEBUG2,
-                   (errmsg("primary_conninfo = '%s'",
-                           PrimaryConnInfo)));
+                   (errmsg_internal("primary_conninfo = '%s'",
+                                    PrimaryConnInfo)));
        }
        else if (strcmp(item->name, "trigger_file") == 0)
        {
            TriggerFile = pstrdup(item->value);
            ereport(DEBUG2,
-                   (errmsg("trigger_file = '%s'",
-                           TriggerFile)));
+                   (errmsg_internal("trigger_file = '%s'",
+                                    TriggerFile)));
        }
        else
            ereport(FATAL,
@@ -7978,7 +7983,8 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
        if (RmgrTable[rmid].rm_safe_restartpoint != NULL)
            if (!(RmgrTable[rmid].rm_safe_restartpoint()))
            {
-               elog(trace_recovery(DEBUG2), "RM %d not safe to record restart point at %X/%X",
+               elog(trace_recovery(DEBUG2),
+                    "RM %d not safe to record restart point at %X/%X",
                     rmid,
                     checkPoint->redo.xlogid,
                     checkPoint->redo.xrecoff);