cleanup of grammer.

diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index 271cc878168eafe3d42518cca1b12658d766061a..3a0a18f6d852059b3634829d6d89130791e977e2 100644 (file)
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -242,7 +242,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.83 1999/03/18 21:39:51 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.84 1999/03/18 22:01:50 momjian Exp $
  *
  * HISTORY
  *       AUTHOR                        DATE                    MAJOR EVENT
@@ -1506,7 +1506,7 @@ static const short yypact[] = {  3123,
   7047,   255,-32768,   513, 14408,  7927,    62,-32768,-32768, 15419,
  11074,   866,   959,-32768,    41,   757,   758,   263,   771,-32768,
 -32768,-32768,   776,   941,   778,    92,   205,   901,   936,-32768,
- 10883,   186,   267,   780,   783,   791,   793,  9687,  9687,  9687,
+ 10883,   575,   267,   780,   783,   791,   793,  9687,  9687,  9687,
   9687,   794,   340,   513,   799,-32768,   -27,   -13,   802,   872,
   7267,  8147,  7267,  7267, 11166,   -72,   804, 11057,-32768,  1152,
   7927,   798,   784,   809,-32768,-32768,-32768,-32768,-32768,-32768,

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b913100e666e49a17a14d1c8a7abcb42d8af8d30..2b39bf8c175e296a0cb8e8ebb43839fbfc5929cd 100644 (file)
--- 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.63 1999/03/18 21:39:56 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.64 1999/03/18 22:01:56 momjian Exp $
  *
  * HISTORY
  *       AUTHOR                        DATE                    MAJOR EVENT
@@ -316,7 +316,7 @@ Oid param_type(int t); /* used in parse_expr.c */
                MAXVALUE, MINVALUE, MOVE,
                NEW, NOCREATEDB, NOCREATEUSER, NONE, NOTHING, NOTIFY, NOTNULL,
                OFFSET, OIDS, OPERATOR, PASSWORD, PROCEDURAL,
-               RECIPE, RENAME, RESET, RETURNS, ROW, RULE,
+               RENAME, RESET, RETURNS, ROW, RULE,
                SEQUENCE, SERIAL, SETOF, SHOW, START, STATEMENT, STDIN, STDOUT, TRUSTED, 
                UNLISTEN, UNTIL, VACUUM, VALID, VERBOSE, VERSION
 
@@ -3715,7 +3715,7 @@ a_expr:  attr opt_indirection
                /* We allow this for standards-broken SQL products, like MS stuff */
                | a_expr '=' NULL_P
                                {       $$ = makeA_Expr(ISNULL, NULL, $1, NULL); }
-               | NULL_P '=' %prec '-' a_expr
+               | NULL_P '=' a_expr /* we need to fix the shift/reduce */
                                {       $$ = makeA_Expr(ISNULL, NULL, $3, NULL); }
 
                | a_expr '=' a_expr