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

tglsfdc · tglsfdc · commit 1be014313a81 · 2002-08-04T23:49:59.000Z
diff --git 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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.84 2002/08/04 20:00:15 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.85 2002/08/04 23:49:59 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -318,7 +318,7 @@ ProcedureCreate(const char *procedureName,`
`318`	`318`	`* type he claims.`
`319`	`319`	`*/`
`320`	`320`	`static void`
`321`		`-checkretval(Oid rettype, char fn_typtype /* XXX FIX ME /, List queryTreeList)`
	`321`	`+checkretval(Oid rettype, char fn_typtype, List *queryTreeList)`
`322`	`322`	`{`
`323`	`323`	`Query *parse;`
`324`	`324`	`int cmd;`