open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various message fixes, among those fixes for the previous round of fixes

Browse Source
REL7_4_STABLE
Peter Eisentraut 22 years ago
parent 98150f108f
commit d84b6ef56b
18 changed files with 46 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      src/backend/access/transam/xlog.c
  2. 4
      src/backend/catalog/pg_proc.c
  3. 4
      src/backend/commands/indexcmds.c
  4. 6
      src/backend/commands/opclasscmds.c
  5. 4
      src/backend/libpq/auth.c
  6. 8
      src/backend/libpq/be-secure.c
  7. 4
      src/backend/parser/analyze.c
  8. 6
      src/backend/parser/gram.y
  9. 6
      src/backend/parser/parse_clause.c
  10. 8
      src/backend/parser/parse_expr.c
  11. 4
      src/backend/port/sysv_sema.c
  12. 4
      src/backend/port/sysv_shmem.c
  13. 4
      src/backend/postmaster/postmaster.c
  14. 6
      src/backend/rewrite/rewriteDefine.c
  15. 4
      src/backend/utils/adt/ascii.c
  16. 4
      src/backend/utils/adt/date.c
  17. 4
      src/backend/utils/init/miscinit.c
  18. 4
      src/backend/utils/misc/guc.c

6
src/backend/access/transam/xlog.c
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.123 2003/09/25 06:57:57 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.124 2003/09/26 15:27:19 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -1962,7 +1962,7 @@ got_record:;
{
ereport(emode,
(errcode_for_file_access(),
errmsg("could not read log file %u, segment %u, offset %u: %m",
errmsg("could not from read log file %u, segment %u, offset %u: %m",
readId, readSeg, readOff)));
goto next_record_is_invalid;
}
@ -2197,7 +2197,7 @@ WriteControlFile(void)
if (pg_fsync(fd) != 0)
ereport(PANIC,
(errcode_for_file_access(),
errmsg("could not fsync of control file: %m")));
errmsg("could not fsync control file: %m")));
close(fd);
}

4
src/backend/catalog/pg_proc.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.106 2003/09/25 06:57:58 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.107 2003/09/26 15:27:26 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -532,7 +532,7 @@ check_sql_fn_retval(Oid rettype, char fn_typtype, List *queryTreeList)
/* This should already have been caught ... */
ereport(ERROR,
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
errmsg("cannot determine result datatype"),
errmsg("cannot determine result data type"),
errdetail("A function returning ANYARRAY or ANYELEMENT must have at least one argument of either type.")));
}
else

4
src/backend/commands/indexcmds.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.110 2003/09/25 06:57:58 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.111 2003/09/26 15:27:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -168,7 +168,7 @@ DefineIndex(RangeVar *heapRelation,
if (length(rangetable) != 1 || getrelid(1, rangetable) != relationId)
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("index expressions and predicates may refer only to the base relation")));
errmsg("index expressions and predicates may refer only to the table being indexed")));
}
/*

6
src/backend/commands/opclasscmds.c
Unescape View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.20 2003/09/25 06:57:58 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.21 2003/09/26 15:27:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -284,10 +284,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
if (opclass->opcintype == typeoid && opclass->opcdefault)
ereport(ERROR,
(errcode(ERRCODE_DUPLICATE_OBJECT),
errmsg("could not make class \"%s\" be default for type %s",
errmsg("could not make operator class \"%s\" be default for type %s",
opcname,
TypeNameToString(stmt->datatype)),
errdetail("Class \"%s\" already is the default.",
errdetail("Operator class \"%s\" already is the default.",
NameStr(opclass->opcname))));
}

4
src/backend/libpq/auth.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.111 2003/09/25 06:57:59 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.112 2003/09/26 15:27:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -492,7 +492,7 @@ ClientAuthentication(Port *port)
if (setsockopt(port->sock, 0, LOCAL_CREDS, &on, sizeof(on)) < 0)
ereport(FATAL,
(errcode_for_socket_access(),
errmsg("failed to enable credential receipt: %m")));
errmsg("could not enable credential reception: %m")));
}
#endif
if (port->raddr.addr.ss_family == AF_UNIX)

8
src/backend/libpq/be-secure.c
Unescape View File

@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.42 2003/09/25 06:57:59 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.43 2003/09/26 15:27:31 petere Exp $
*
* Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database
@ -293,7 +293,8 @@ rloop:
default:
ereport(COMMERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("unrecognized SSL error code")));
errmsg("unrecognized SSL error code %d",
SSL_get_error(port->ssl, n))));
n = -1;
break;
}
@ -377,7 +378,8 @@ wloop:
default:
ereport(COMMERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("unrecognized SSL error code")));
errmsg("unrecognized SSL error code %d",
SSL_get_error(port->ssl, n))));
n = -1;
break;
}

4
src/backend/parser/analyze.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.288 2003/09/25 06:58:00 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.289 2003/09/26 15:27:32 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -3029,7 +3029,7 @@ transformConstraintAttrs(List *constraintList)
else if (!((FkConstraint *) lastprimarynode)->deferrable)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
break;
case CONSTR_ATTR_IMMEDIATE:
if (lastprimarynode == NULL ||

6
src/backend/parser/gram.y
Unescape View File

@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.434 2003/09/25 06:58:00 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.435 2003/09/26 15:27:32 petere Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@ -2190,7 +2190,7 @@ ConstraintAttributeSpec:
if ($1 == 0 && $2 != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
$$ = $1 | $2;
}
| ConstraintTimeSpec
@ -2205,7 +2205,7 @@ ConstraintAttributeSpec:
if ($2 == 0 && $1 != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
$$ = $1 | $2;
}
| /*EMPTY*/

6
src/backend/parser/parse_clause.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.123 2003/09/25 06:58:01 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.124 2003/09/26 15:27:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -749,7 +749,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
if (l_index < 0)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_COLUMN),
errmsg("column \"%s\" specified in USING clause not found in left table",
errmsg("column \"%s\" specified in USING clause does not exist in left table",
u_colname)));
/* Find it in right input */
@ -772,7 +772,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
if (r_index < 0)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_COLUMN),
errmsg("column \"%s\" specified in USING clause not found in right table",
errmsg("column \"%s\" specified in USING clause does not exist in right table",
u_colname)));
l_colvar = nth(l_index, l_colvars);

8
src/backend/parser/parse_expr.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.162 2003/09/25 06:58:01 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.163 2003/09/26 15:27:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -601,17 +601,17 @@ transformExpr(ParseState *pstate, Node *expr)
if (opform->oprresult != BOOLOID)
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("operator %s must return boolean, not type %s",
errmsg("operator %s must return type boolean, not type %s",
opname,
format_type_be(opform->oprresult)),
errhint("The operator of a quantified predicate subquery must return boolean.")));
errhint("The operator of a quantified predicate subquery must return type boolean.")));
if (get_func_retset(opform->oprcode))
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("operator %s must not return a set",
opname),
errhint("The operator of a quantified predicate subquery must return boolean.")));
errhint("The operator of a quantified predicate subquery must return type boolean.")));
sublink->operOids = lappendo(sublink->operOids,
oprid(optup));

4
src/backend/port/sysv_sema.c
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.9 2003/08/04 02:40:02 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.10 2003/09/26 15:27:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -115,7 +115,7 @@ InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems)
*/
ereport(FATAL,
(errmsg("could not create semaphores: %m"),
errdetail("Failed syscall was semget(%d, %d, 0%o).",
errdetail("Failed system call was semget(%d, %d, 0%o).",
(int) semKey, numSems,
IPC_CREAT | IPC_EXCL | IPCProtection),
(errno == ENOSPC) ?

4
src/backend/port/sysv_shmem.c
Unescape View File

@ -10,7 +10,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.15 2003/08/04 02:40:02 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.16 2003/09/26 15:27:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -90,7 +90,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
*/
ereport(FATAL,
(errmsg("could not create shared memory segment: %m"),
errdetail("Failed syscall was shmget(key=%d, size=%u, 0%o).",
errdetail("Failed system call was shmget(key=%d, size=%u, 0%o).",
(int) memKey, size,
IPC_CREAT | IPC_EXCL | IPCProtection),
(errno == EINVAL) ?

4
src/backend/postmaster/postmaster.c
Unescape View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.346 2003/09/25 06:58:01 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.347 2003/09/26 15:27:35 petere Exp $
*
* NOTES
*
@ -977,7 +977,7 @@ usage(const char *progname)
printf(gettext(" -l enable SSL connections\n"));
#endif
printf(gettext(" -N MAX-CONNECT maximum number of allowed connections\n"));
printf(gettext(" -o OPTIONS pass 'OPTIONS' to each backend server\n"));
printf(gettext(" -o OPTIONS pass \"OPTIONS\" to each server process\n"));
printf(gettext(" -p PORT port number to listen on\n"));
printf(gettext(" -S silent mode (start in background without logging output)\n"));
printf(gettext(" --help show this help, then exit\n"));

6
src/backend/rewrite/rewriteDefine.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.88 2003/09/25 06:58:01 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.89 2003/09/26 15:27:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -253,7 +253,7 @@ DefineQueryRewrite(RuleStmt *stmt)
if (length(action) == 0)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("INSTEAD NOTHING rules on select are not implemented"),
errmsg("INSTEAD NOTHING rules on SELECT are not implemented"),
errhint("Use views instead.")));
/*
@ -271,7 +271,7 @@ DefineQueryRewrite(RuleStmt *stmt)
if (!is_instead || query->commandType != CMD_SELECT)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("rules on SELECT rule must have action INSTEAD SELECT")));
errmsg("rules on SELECT must have action INSTEAD SELECT")));
/*
* ... there can be no rule qual, ...

4
src/backend/utils/adt/ascii.c
Unescape View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1999-2003, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.18 2003/08/04 23:59:38 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.19 2003/09/26 15:27:36 petere Exp $
*
*-----------------------------------------------------------------------
*/
@ -65,7 +65,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
{
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("unsupported encoding conversion from %s to ASCII",
errmsg("encoding conversion from %s to ASCII not supported",
pg_encoding_to_char(enc))));
return; /* keep compiler quiet */
}

4
src/backend/utils/adt/date.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.92 2003/09/25 06:58:03 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93 2003/09/26 15:27:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -2241,7 +2241,7 @@ timetz_izone(PG_FUNCTION_ARGS)
if (zone->month != 0)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("\"interval\" time zone \"%s\" not legal",
errmsg("\"interval\" time zone \"%s\" not valid",
DatumGetCString(DirectFunctionCall1(interval_out,
PointerGetDatum(zone))))));

4
src/backend/utils/init/miscinit.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.115 2003/09/25 06:58:05 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.116 2003/09/26 15:27:37 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -823,7 +823,7 @@ ValidatePgVersion(const char *path)
else
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not open \"%s\": %m", full_path)));
errmsg("could not open file \"%s\": %m", full_path)));
}
ret = fscanf(file, "%ld.%ld", &file_major, &file_minor);

4
src/backend/utils/misc/guc.c
Unescape View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.159 2003/09/25 06:58:05 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.160 2003/09/26 15:27:37 petere Exp $
*
*--------------------------------------------------------------------
*/
@ -1315,7 +1315,7 @@ static struct config_string ConfigureNamesString[] =
{
{"log_min_error_statement", PGC_USERLIMIT, LOGGING_WHEN,
gettext_noop("log statement generating error at or above this level"),
gettext_noop("log statements generating error at or above this level"),
gettext_noop("All SQL statements that cause an error of the "
"specified level or a higher level are logged.")
},

Write Preview
Loading…
Cancel
Save