diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/analyze.c | 6 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 4 | ||||
| -rw-r--r-- | src/backend/parser/parse_node.c | 4 | ||||
| -rw-r--r-- | src/backend/parser/parse_type.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 2ac263fb267..bf8494c18cb 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.c,v 1.128 2000/01/10 05:20:21 momjian Exp $ + * $Id: analyze.c,v 1.129 2000/01/15 02:59:31 petere Exp $ * *------------------------------------------------------------------------- */ @@ -732,7 +732,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt) break; default: - elog(ERROR, "parser: unrecognized constraint (internal error)", NULL); + elog(ERROR, "parser: unrecognized constraint (internal error)"); break; } } @@ -1598,7 +1598,7 @@ transformForUpdate(Query *qry, List *forUpdate) i++; } if (l2 == NULL) - elog(ERROR, "FOR UPDATE: relation %s not found in FROM clause", lfirst(l)); + elog(ERROR, "FOR UPDATE: relation %s not found in FROM clause", strVal(lfirst(l))); } qry->rowMark = rowMark; diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 069af39f05f..b7e3b6f47a9 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.125 2000/01/14 22:11:34 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.126 2000/01/15 02:59:32 petere Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3622,7 +3622,7 @@ Character: character '(' Iconst ')' if ($3 < 1) elog(ERROR,"length for '%s' type must be at least 1",$1); else if ($3 > MaxAttrSize) - elog(ERROR,"length for type '%s' cannot exceed %d",$1, + elog(ERROR,"length for type '%s' cannot exceed %ld",$1, MaxAttrSize); /* we actually implement this sort of like a varlen, so diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index c660df38261..544a4462dd1 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.34 1999/12/24 06:43:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.35 2000/01/15 02:59:32 petere Exp $ * *------------------------------------------------------------------------- */ @@ -261,7 +261,7 @@ transformArraySubscripts(ParseState *pstate, typeelement = type_struct_array->typelem; if (typeelement == InvalidOid) elog(ERROR, "transformArraySubscripts: type %s is not an array", - type_struct_array->typname); + NameStr(type_struct_array->typname)); /* Get the type tuple for the array element type */ type_tuple = SearchSysCacheTuple(TYPEOID, diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c index d76d573de13..1a2693d69f2 100644 --- a/src/backend/parser/parse_type.c +++ b/src/backend/parser/parse_type.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.27 1999/11/22 17:56:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.28 2000/01/15 02:59:32 petere Exp $ * *------------------------------------------------------------------------- */ @@ -226,7 +226,7 @@ GetArrayElementType(Oid typearray) if (type_struct_array->typelem == InvalidOid) { elog(ERROR, "GetArrayElementType: type %s is not an array", - type_struct_array->typname); + NameStr(type_struct_array->typname)); } return type_struct_array->typelem; |