diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/hba.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/jsonfuncs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index acf625e4ec1..1a65ec87bd2 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -1519,10 +1519,10 @@ parse_hba_line(TokenizedLine *tok_line, int elevel) { ereport(elevel, (errcode(ERRCODE_CONFIG_FILE_ERROR), - errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix"), + errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"), errcontext("line %d of configuration file \"%s\"", line_num, HbaFileName))); - *err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix"; + *err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"; return NULL; } } diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index b95f5a7c40a..e358b5ad133 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -4975,7 +4975,7 @@ parse_jsonb_index_flags(Jsonb *jb) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("flag array element is not a string"), - errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\""))); + errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\""))); if (v.val.string.len == 3 && pg_strncasecmp(v.val.string.val, "all", 3) == 0) @@ -4997,7 +4997,7 @@ parse_jsonb_index_flags(Jsonb *jb) (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("wrong flag in flag array: \"%s\"", pnstrdup(v.val.string.val, v.val.string.len)), - errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\""))); + errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\""))); } /* expect end of array now */ |