Various message fixes, among those fixes for the previous round of fixes
authorPeter Eisentraut <peter_e@gmx.net>
Fri, 26 Sep 2003 15:27:37 +0000 (15:27 +0000)
committerPeter Eisentraut <peter_e@gmx.net>
Fri, 26 Sep 2003 15:27:37 +0000 (15:27 +0000)
18 files changed:
src/backend/access/transam/xlog.c
src/backend/catalog/pg_proc.c
src/backend/commands/indexcmds.c
src/backend/commands/opclasscmds.c
src/backend/libpq/auth.c
src/backend/libpq/be-secure.c
src/backend/parser/analyze.c
src/backend/parser/gram.y
src/backend/parser/parse_clause.c
src/backend/parser/parse_expr.c
src/backend/port/sysv_sema.c
src/backend/port/sysv_shmem.c
src/backend/postmaster/postmaster.c
src/backend/rewrite/rewriteDefine.c
src/backend/utils/adt/ascii.c
src/backend/utils/adt/date.c
src/backend/utils/init/miscinit.c
src/backend/utils/misc/guc.c

index 32e7672945e6f8cec614fb809ea880bceee48979..282ea7058dcb8521e7f3bad4d0e0eaf4883fc07a 100644 (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);
 }
index 0734e479fc717d94f351bf41d839e777a5b9b93f..e28cdbd1126dfc0145621855a3abadb44ff2ad80 100644 (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
index 8ded744b67460304379df7fa5f12f11d5f46172a..12ed77f18f800fc72b9cffb4919b1e6a78e66fbc 100644 (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")));
    }
 
    /*
index abccad1078f1f214b4e0233ce6ec41a762802483..c183d7ad5bc248b6a45aedf625846e14bb84af95 100644 (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))));
        }
 
index dca08a34936e5b0876ca04f3a402ad8df2dd2dd3..65b1da632854c0a865834c57bdb6e3bb38fe8b07 100644 (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)
index 216cf505b95d3db7bc720ed6d22b258ddb2ffda5..1e69f14fd4b74635c4dd1294a68b069af3fdd1e3 100644 (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;
        }
index 37f543c1eaf3c47bbb0f5a90d408109b1c8a9620..4d1cd28f123e730557d9bf8825bb2069189656c7 100644 (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 ||
index 914b7150401a7ef3823279e6580f08a66817d74a..9e72f3bcd3f5f1eae31c2feb2254e11b7d62a07b 100644 (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*/
index ac5543735e9a82407cb5efbca5909572edbae854..20937ad2b698f373e000d603d313a966d8313b91 100644 (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);
index 88768b3b4e573f26f88ac580682aff5b1fc05740..b5d23fadfeb852dab444e6d07043e1698d35ed15 100644 (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));
index 41963d6582582c7c11f2cd341f1f51346768ced9..4adba6d3b86b8333f017387dbe6cace68b659fb5 100644 (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) ?
index 04fd98dc1b1bf31a0a61835b20f32b1020c8bb0c..d19020f12c4123d40e7db5ef0ab83cb4ca44aaae 100644 (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) ?
index 9907cb3a8a85564724e7e48e3bb7a70e9e2f863f..26cf8f9633dda7de6595c936f22d9b24e17e4e8c 100644 (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"));
index dfe693134b55730661c385635f7747a12760c8f4..49ca4f7565ec6188d15a1e0a75ba80d96a6c0617 100644 (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, ...
index 30014011ee9b012194b8280a2fcdeadac22aef1b..7742a085d760e28d2fe5f29f73a2847ae9c61d42 100644 (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 */
    }
index 49ef50d21c4ed9fe783ef1118c4e2a031fb0643e..a0d00e73dc2af0a68487ba1b2da90ca54cc4844e 100644 (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))))));
 
index a127296cd95432fd29e22dafc6e08792164f9be5..2b9ab066185fa70e1b2699687b65fac1157e4484 100644 (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);
index 9386013ac1b034c6c45df2ab7099ce885f071af5..dbd71dcbca41ca3436d06b99760a1846d585d7cf 100644 (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.")
        },