diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/nodes/nodes.h | 9 | ||||
| -rw-r--r-- | src/include/parser/gramparse.h | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index b092563e41c..b8415378d95 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.183 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.184 2006/03/07 01:00:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -458,13 +458,6 @@ typedef enum JoinType JOIN_RIGHT, /* pairs + unmatched inner tuples */ /* - * SQL92 considers UNION JOIN to be a kind of join, so list it here for - * parser convenience, even though it's not implemented like a join in the - * executor. (The planner must convert it to an Append plan.) - */ - JOIN_UNION, - - /* * These are used for queries like WHERE foo IN (SELECT bar FROM ...). * Only JOIN_IN is actually implemented in the executor; the others are * defined for internal use in the planner. diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index eb043965d0d..054604521bc 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/gramparse.h,v 1.32 2006/03/05 15:58:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/parser/gramparse.h,v 1.33 2006/03/07 01:00:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -18,18 +18,15 @@ #include "nodes/parsenodes.h" -/* from parser.c */ -extern int yylex(void); - /* from scan.l */ extern void scanner_init(const char *str); extern void scanner_finish(void); extern int base_yylex(void); -extern void yyerror(const char *message); +extern void base_yyerror(const char *message); /* from gram.y */ extern void parser_init(void); -extern int yyparse(void); +extern int base_yyparse(void); extern List *SystemFuncName(char *name); extern TypeName *SystemTypeName(char *name); extern bool exprIsNullConstant(Node *arg); |