git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c

index ac662549e90979abad55160bded296e8e271cca4..19d19e5f396a8adb212c0ba23d4f43db539a1557 100644 (file)

--- a/src/backend/parser/parse_utilcmd.c

+++ b/src/backend/parser/parse_utilcmd.c

if (cxt->isforeign)

ereport(ERROR,

(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

- errmsg("LIKE is not supported for foreign tables")));

+ errmsg("LIKE is not supported for creating foreign tables")));

relation = relation_openrv(table_like_clause->relation, AccessShareLock);

diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c

index 1cfebed51ca081b3970fab977e79ba3455a52c42..20e3c321abd2cd8a81dc25dff59fabc57106523f 100644 (file)

--- a/src/backend/port/sysv_shmem.c

+++ b/src/backend/port/sysv_shmem.c

"memory configuration.") : 0,

(errno == ENOMEM) ?

errhint("This error usually means that PostgreSQL's request for a shared "

- "memory segment exceeded your kernel's SHMALL parameter. You may need "

+ "memory segment exceeded your kernel's SHMALL parameter. You might need "

"to reconfigure the kernel with larger SHMALL.\n"

"The PostgreSQL documentation contains more information about shared "

"memory configuration.") : 0,

diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c

index 5ed422999c3e9a03a87567dbf5101144b7bbd0e1..19a1398d8ab78904feedca18045280b39d13d194 100644 (file)

--- a/src/backend/postmaster/bgworker.c

+++ b/src/backend/postmaster/bgworker.c

/* Log it! */

ereport(LOG,

- (errmsg("registering background worker: %s",

+ (errmsg("registering background worker \"%s\"",

rw->rw_worker.bgw_name)));

slist_push_head(&BackgroundWorkerList, &rw->rw_lnode);

slot->in_use = false;

ereport(LOG,

- (errmsg("unregistering background worker: %s",

+ (errmsg("unregistering background worker \"%s\"",

rw->rw_worker.bgw_name)));

slist_delete_current(cur);

if (!IsUnderPostmaster)

ereport(LOG,

- (errmsg("registering background worker: %s", worker->bgw_name)));

+ (errmsg("registering background worker \"%s\"", worker->bgw_name)));

if (!process_shared_preload_libraries_in_progress)

{

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c

index 5a816a2d3a78e2f5332f75e92f32d2b3db5356f6..afdb53f9b553c0cb558ab3463e1eb82a14f04546 100644 (file)

--- a/src/backend/postmaster/postmaster.c

+++ b/src/backend/postmaster/postmaster.c

/* it had better not gotten out of "init" mode yet */

if (!IsInitProcessingMode())

ereport(ERROR,

- (errmsg("invalid processing mode in bgworker")));

+ (errmsg("invalid processing mode in background worker")));

SetProcessingMode(NormalProcessing);

}

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c

index 78a194539d150adc9a942400bd7a9167d81b25c7..2cbe83200f1fafd0c9239c4ecf29337301412e30 100644 (file)

--- a/src/backend/utils/adt/jsonfuncs.c

+++ b/src/backend/utils/adt/jsonfuncs.c

_state->lex->token_type != JSON_TOKEN_OBJECT_START)

ereport(ERROR,

(errcode(ERRCODE_INVALID_PARAMETER_VALUE),

- errmsg("must call populate_recordset on an array of objects")));

+ errmsg("must call json_populate_recordset on an array of objects")));

}

static void

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c

index 2b753f81d76689c5cff045d70c5f7bac2a152208..047dfd126936976bb12a70e547748a1a2050f40a 100644 (file)

--- a/src/backend/utils/misc/guc.c

+++ b/src/backend/utils/misc/guc.c

{

{"wal_receiver_timeout", PGC_SIGHUP, REPLICATION_STANDBY,

- gettext_noop("Sets the maximum wait time to receive data from master."),

+ gettext_noop("Sets the maximum wait time to receive data from the primary."),

NULL,

GUC_UNIT_MS

},