Fix merge failures for anonymous-type patch. From Joe Conway.

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 64a925ad1a257d734a8f8b19f2c5a79d87e4e1a6..a4dfc7fe295dee741e36cabeae628120a43df21f 100644 (file)
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.84 2002/08/04 20:00:15 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.85 2002/08/04 23:49:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -318,7 +318,7 @@ ProcedureCreate(const char *procedureName,
  * type he claims.
  */
 static void
-checkretval(Oid rettype, char fn_typtype /* XXX FIX ME */, List *queryTreeList)
+checkretval(Oid rettype, char fn_typtype, List *queryTreeList)
 {
    Query      *parse;
    int         cmd;

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 683e859227eb25c532234964d57a9d9b061ee31a..e87e9f4f94acd39ad9f3e34369fc13e42ca6e8e5 100644 (file)
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -20,7 +20,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.148 2002/08/04 20:00:15 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.149 2002/08/04 23:49:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1607,10 +1607,7 @@ _equalRangeVar(RangeVar *a, RangeVar *b)
        return false;
    if (!equal(a->alias, b->alias))
        return false;
-/* FIX ME XXX
-   if (!equal(a->coldeflist, b->coldeflist))
-       return false;
-*/
+
    return true;
 }
 
@@ -1632,6 +1629,8 @@ _equalRangeFunction(RangeFunction *a, RangeFunction *b)
        return false;
    if (!equal(a->alias, b->alias))
        return false;
+   if (!equal(a->coldeflist, b->coldeflist))
+       return false;
 
    return true;
 }