Fix compile failures for FRS composite tyhpe patch until Joe can fix it.

bmomjian · bmomjian · commit 58c227693d80 · 2002-08-04T20:00:15.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.83 2002/08/04 19:48:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.84 2002/08/04 20:00:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -318,7 +318,7 @@ ProcedureCreate(const char *procedureName,
  * type he claims.
  */
 static void
-checkretval(Oid rettype, List *queryTreeList)
+checkretval(Oid rettype, char fn_typtype /* XXX FIX ME */, 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.147 2002/08/04 19:48:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.148 2002/08/04 20:00:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1607,9 +1607,10 @@ _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;
 }
 

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.83 2002/08/04 19:48:09 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.84 2002/08/04 20:00:15 momjian 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, List *queryTreeList)`
	`321`	`+checkretval(Oid rettype, char fn_typtype /* XXX FIX ME /, List queryTreeList)`
`322`	`322`	`{`
`323`	`323`	`Query *parse;`
`324`	`324`	`int cmd;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* Portions Copyright (c) 1994, Regents of the University of California`
`21`	`21`	`*`
`22`	`22`	`* IDENTIFICATION`
`23`		`- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.147 2002/08/04 19:48:09 momjian Exp $`
	`23`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.148 2002/08/04 20:00:15 momjian Exp $`
`24`	`24`	`*`
`25`	`25`	`*-------------------------------------------------------------------------`
`26`	`26`	`*/`
`@@ -1607,9 +1607,10 @@ _equalRangeVar(RangeVar a, RangeVar b)`
`1607`	`1607`	`return false;`
`1608`	`1608`	`if (!equal(a->alias, b->alias))`
`1609`	`1609`	`return false;`
	`1610`	`+/* FIX ME XXX`
`1610`	`1611`	`if (!equal(a->coldeflist, b->coldeflist))`
`1611`	`1612`	`return false;`
`1612`		`-`
	`1613`	`+*/`
`1613`	`1614`	`return true;`
`1614`	`1615`	`}`
`1615`	`1616`