Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd84b6ef

Browse files
committed
Various message fixes, among those fixes for the previous round of fixes
1 parent98150f1 commitd84b6ef

File tree

18 files changed

+46
-44
lines changed

18 files changed

+46
-44
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.123 2003/09/25 06:57:57 petere Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.124 2003/09/26 15:27:19 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1962,7 +1962,7 @@ got_record:;
19621962
{
19631963
ereport(emode,
19641964
(errcode_for_file_access(),
1965-
errmsg("could not read log file %u, segment %u, offset %u: %m",
1965+
errmsg("could notfromread log file %u, segment %u, offset %u: %m",
19661966
readId,readSeg,readOff)));
19671967
gotonext_record_is_invalid;
19681968
}
@@ -2197,7 +2197,7 @@ WriteControlFile(void)
21972197
if (pg_fsync(fd)!=0)
21982198
ereport(PANIC,
21992199
(errcode_for_file_access(),
2200-
errmsg("could not fsyncofcontrol file: %m")));
2200+
errmsg("could not fsync control file: %m")));
22012201

22022202
close(fd);
22032203
}

‎src/backend/catalog/pg_proc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.106 2003/09/25 06:57:58 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.107 2003/09/26 15:27:26 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -532,7 +532,7 @@ check_sql_fn_retval(Oid rettype, char fn_typtype, List *queryTreeList)
532532
/* This should already have been caught ... */
533533
ereport(ERROR,
534534
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
535-
errmsg("cannot determine resultdatatype"),
535+
errmsg("cannot determine resultdata type"),
536536
errdetail("A function returning ANYARRAY or ANYELEMENT must have at least one argument of either type.")));
537537
}
538538
else

‎src/backend/commands/indexcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.110 2003/09/25 06:57:58 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.111 2003/09/26 15:27:31 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -168,7 +168,7 @@ DefineIndex(RangeVar *heapRelation,
168168
if (length(rangetable)!=1||getrelid(1,rangetable)!=relationId)
169169
ereport(ERROR,
170170
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
171-
errmsg("index expressions and predicates may refer only to thebase relation")));
171+
errmsg("index expressions and predicates may refer only to thetable being indexed")));
172172
}
173173

174174
/*

‎src/backend/commands/opclasscmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.20 2003/09/25 06:57:58 petere Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.21 2003/09/26 15:27:31 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -284,10 +284,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
284284
if (opclass->opcintype==typeoid&&opclass->opcdefault)
285285
ereport(ERROR,
286286
(errcode(ERRCODE_DUPLICATE_OBJECT),
287-
errmsg("could not make class \"%s\" be default for type %s",
287+
errmsg("could not makeoperatorclass \"%s\" be default for type %s",
288288
opcname,
289289
TypeNameToString(stmt->datatype)),
290-
errdetail("Class \"%s\" already is the default.",
290+
errdetail("Operator class \"%s\" already is the default.",
291291
NameStr(opclass->opcname))));
292292
}
293293

‎src/backend/libpq/auth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.111 2003/09/25 06:57:59 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.112 2003/09/26 15:27:31 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -492,7 +492,7 @@ ClientAuthentication(Port *port)
492492
if (setsockopt(port->sock,0,LOCAL_CREDS,&on,sizeof(on))<0)
493493
ereport(FATAL,
494494
(errcode_for_socket_access(),
495-
errmsg("failed to enable credentialreceipt: %m")));
495+
errmsg("could not enable credentialreception: %m")));
496496
}
497497
#endif
498498
if (port->raddr.addr.ss_family==AF_UNIX)

‎src/backend/libpq/be-secure.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.42 2003/09/25 06:57:59 petere Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.43 2003/09/26 15:27:31 petere Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -293,7 +293,8 @@ secure_read(Port *port, void *ptr, size_t len)
293293
default:
294294
ereport(COMMERROR,
295295
(errcode(ERRCODE_PROTOCOL_VIOLATION),
296-
errmsg("unrecognized SSL error code")));
296+
errmsg("unrecognized SSL error code %d",
297+
SSL_get_error(port->ssl,n))));
297298
n=-1;
298299
break;
299300
}
@@ -377,7 +378,8 @@ secure_write(Port *port, void *ptr, size_t len)
377378
default:
378379
ereport(COMMERROR,
379380
(errcode(ERRCODE_PROTOCOL_VIOLATION),
380-
errmsg("unrecognized SSL error code")));
381+
errmsg("unrecognized SSL error code %d",
382+
SSL_get_error(port->ssl,n))));
381383
n=-1;
382384
break;
383385
}

‎src/backend/parser/analyze.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
*$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.288 2003/09/25 06:58:00 petere Exp $
9+
*$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.289 2003/09/26 15:27:32 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -3029,7 +3029,7 @@ transformConstraintAttrs(List *constraintList)
30293029
elseif (!((FkConstraint*)lastprimarynode)->deferrable)
30303030
ereport(ERROR,
30313031
(errcode(ERRCODE_SYNTAX_ERROR),
3032-
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
3032+
errmsg("constraint declaredINITIALLY DEFERRED must be DEFERRABLE")));
30333033
break;
30343034
caseCONSTR_ATTR_IMMEDIATE:
30353035
if (lastprimarynode==NULL||

‎src/backend/parser/gram.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.434 2003/09/25 06:58:00 petere Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.435 2003/09/26 15:27:32 petere Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -2190,7 +2190,7 @@ ConstraintAttributeSpec:
21902190
if ($1 ==0 &&$2 !=0)
21912191
ereport(ERROR,
21922192
(errcode(ERRCODE_SYNTAX_ERROR),
2193-
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
2193+
errmsg("constraint declaredINITIALLY DEFERRED must be DEFERRABLE")));
21942194
$$ =$1 |$2;
21952195
}
21962196
|ConstraintTimeSpec
@@ -2205,7 +2205,7 @@ ConstraintAttributeSpec:
22052205
if ($2 ==0 &&$1 !=0)
22062206
ereport(ERROR,
22072207
(errcode(ERRCODE_SYNTAX_ERROR),
2208-
errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
2208+
errmsg("constraint declaredINITIALLY DEFERRED must be DEFERRABLE")));
22092209
$$ =$1 |$2;
22102210
}
22112211
|/*EMPTY*/

‎src/backend/parser/parse_clause.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.123 2003/09/25 06:58:01 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.124 2003/09/26 15:27:35 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -749,7 +749,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
749749
if (l_index<0)
750750
ereport(ERROR,
751751
(errcode(ERRCODE_UNDEFINED_COLUMN),
752-
errmsg("column \"%s\" specified in USING clause notfound in left table",
752+
errmsg("column \"%s\" specified in USING clausedoesnotexist in left table",
753753
u_colname)));
754754

755755
/* Find it in right input */
@@ -772,7 +772,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
772772
if (r_index<0)
773773
ereport(ERROR,
774774
(errcode(ERRCODE_UNDEFINED_COLUMN),
775-
errmsg("column \"%s\" specified in USING clause notfound in right table",
775+
errmsg("column \"%s\" specified in USING clausedoesnotexist in right table",
776776
u_colname)));
777777

778778
l_colvar=nth(l_index,l_colvars);

‎src/backend/parser/parse_expr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.162 2003/09/25 06:58:01 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.163 2003/09/26 15:27:35 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -601,17 +601,17 @@ transformExpr(ParseState *pstate, Node *expr)
601601
if (opform->oprresult!=BOOLOID)
602602
ereport(ERROR,
603603
(errcode(ERRCODE_DATATYPE_MISMATCH),
604-
errmsg("operator %s must return boolean, not type %s",
604+
errmsg("operator %s must returntypeboolean, not type %s",
605605
opname,
606606
format_type_be(opform->oprresult)),
607-
errhint("The operator of a quantified predicate subquery must return boolean.")));
607+
errhint("The operator of a quantified predicate subquery must returntypeboolean.")));
608608

609609
if (get_func_retset(opform->oprcode))
610610
ereport(ERROR,
611611
(errcode(ERRCODE_DATATYPE_MISMATCH),
612612
errmsg("operator %s must not return a set",
613613
opname),
614-
errhint("The operator of a quantified predicate subquery must return boolean.")));
614+
errhint("The operator of a quantified predicate subquery must returntypeboolean.")));
615615

616616
sublink->operOids=lappendo(sublink->operOids,
617617
oprid(optup));

‎src/backend/port/sysv_sema.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.9 2003/08/04 02:40:02 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.10 2003/09/26 15:27:35 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -115,7 +115,7 @@ InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems)
115115
*/
116116
ereport(FATAL,
117117
(errmsg("could not create semaphores: %m"),
118-
errdetail("Failedsyscall was semget(%d, %d, 0%o).",
118+
errdetail("Failedsystem call was semget(%d, %d, 0%o).",
119119
(int)semKey,numSems,
120120
IPC_CREAT |IPC_EXCL |IPCProtection),
121121
(errno==ENOSPC) ?

‎src/backend/port/sysv_shmem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Portions Copyright (c) 1994, Regents of the University of California
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.15 2003/08/04 02:40:02 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.16 2003/09/26 15:27:35 petere Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -90,7 +90,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
9090
*/
9191
ereport(FATAL,
9292
(errmsg("could not create shared memory segment: %m"),
93-
errdetail("Failedsyscall was shmget(key=%d, size=%u, 0%o).",
93+
errdetail("Failedsystem call was shmget(key=%d, size=%u, 0%o).",
9494
(int)memKey,size,
9595
IPC_CREAT |IPC_EXCL |IPCProtection),
9696
(errno==EINVAL) ?

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.346 2003/09/25 06:58:01 petere Exp $
40+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.347 2003/09/26 15:27:35 petere Exp $
4141
*
4242
* NOTES
4343
*
@@ -977,7 +977,7 @@ usage(const char *progname)
977977
printf(gettext(" -l enable SSL connections\n"));
978978
#endif
979979
printf(gettext(" -N MAX-CONNECT maximum number of allowed connections\n"));
980-
printf(gettext(" -o OPTIONS pass'OPTIONS' to eachbackendserver\n"));
980+
printf(gettext(" -o OPTIONS pass\"OPTIONS\" to each server process\n"));
981981
printf(gettext(" -p PORT port number to listen on\n"));
982982
printf(gettext(" -S silent mode (start in background without logging output)\n"));
983983
printf(gettext(" --help show this help, then exit\n"));

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.88 2003/09/25 06:58:01 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.89 2003/09/26 15:27:36 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -253,7 +253,7 @@ DefineQueryRewrite(RuleStmt *stmt)
253253
if (length(action)==0)
254254
ereport(ERROR,
255255
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
256-
errmsg("INSTEAD NOTHING rules onselect are not implemented"),
256+
errmsg("INSTEAD NOTHING rules onSELECT are not implemented"),
257257
errhint("Use views instead.")));
258258

259259
/*
@@ -271,7 +271,7 @@ DefineQueryRewrite(RuleStmt *stmt)
271271
if (!is_instead||query->commandType!=CMD_SELECT)
272272
ereport(ERROR,
273273
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
274-
errmsg("rules on SELECTrulemust have action INSTEAD SELECT")));
274+
errmsg("rules on SELECT must have action INSTEAD SELECT")));
275275

276276
/*
277277
* ... there can be no rule qual, ...

‎src/backend/utils/adt/ascii.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1999-2003, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
8-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.18 2003/08/04 23:59:38 tgl Exp $
8+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.19 2003/09/26 15:27:36 petere Exp $
99
*
1010
*-----------------------------------------------------------------------
1111
*/
@@ -65,7 +65,7 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int
6565
{
6666
ereport(ERROR,
6767
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
68-
errmsg("unsupportedencoding conversion from %s to ASCII",
68+
errmsg("encoding conversion from %s to ASCII not supported",
6969
pg_encoding_to_char(enc))));
7070
return;/* keep compiler quiet */
7171
}

‎src/backend/utils/adt/date.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.92 2003/09/25 06:58:03 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93 2003/09/26 15:27:36 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -2241,7 +2241,7 @@ timetz_izone(PG_FUNCTION_ARGS)
22412241
if (zone->month!=0)
22422242
ereport(ERROR,
22432243
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
2244-
errmsg("\"interval\" time zone \"%s\" notlegal",
2244+
errmsg("\"interval\" time zone \"%s\" notvalid",
22452245
DatumGetCString(DirectFunctionCall1(interval_out,
22462246
PointerGetDatum(zone))))));
22472247

‎src/backend/utils/init/miscinit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.115 2003/09/25 06:58:05 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.116 2003/09/26 15:27:37 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -823,7 +823,7 @@ ValidatePgVersion(const char *path)
823823
else
824824
ereport(FATAL,
825825
(errcode_for_file_access(),
826-
errmsg("could not open \"%s\": %m",full_path)));
826+
errmsg("could not openfile\"%s\": %m",full_path)));
827827
}
828828

829829
ret=fscanf(file,"%ld.%ld",&file_major,&file_minor);

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.159 2003/09/25 06:58:05 petere Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.160 2003/09/26 15:27:37 petere Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1315,7 +1315,7 @@ static struct config_string ConfigureNamesString[] =
13151315

13161316
{
13171317
{"log_min_error_statement",PGC_USERLIMIT,LOGGING_WHEN,
1318-
gettext_noop("logstatement generating error at or above this level"),
1318+
gettext_noop("logstatements generating error at or above this level"),
13191319
gettext_noop("All SQL statements that cause an error of the "
13201320
"specified level or a higher level are logged.")
13211321
},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp