Commit1be0143

committed

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

1 parente053d20 commit1be0143Copy full SHA for 1be0143

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

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/0420:00:15 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.85 2002/08/0423: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`	`staticvoid`
`321`		`-checkretval(Oidrettype,charfn_typtype/* XXX FIX ME /,ListqueryTreeList)`
	`321`	`+checkretval(Oidrettype,charfn_typtype,List*queryTreeList)`
`322`	`322`	`{`
`323`	`323`	`Query*parse;`
`324`	`324`	`intcmd;`

Lines changed: 4 additions & 5 deletions

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.148 2002/08/0420:00:15 momjian Exp $`
	`23`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.149 2002/08/0423:49:59 tgl Exp $`
`24`	`24`	`*`
`25`	`25`	`*-------------------------------------------------------------------------`
`26`	`26`	`*/`
`@@ -1607,10 +1607,7 @@ _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`
`1611`		`-if (!equal(a->coldeflist, b->coldeflist))`
`1612`		`-return false;`
`1613`		`-*/`
	`1610`	`+`
`1614`	`1611`	`return true;`
`1615`	`1612`	`}`
`1616`	`1613`
`@@ -1632,6 +1629,8 @@ _equalRangeFunction(RangeFunction a, RangeFunction b)`
`1632`	`1629`	`return false;`
`1633`	`1630`	`if (!equal(a->alias,b->alias))`
`1634`	`1631`	`return false;`
	`1632`	`+if (!equal(a->coldeflist,b->coldeflist))`
	`1633`	`+return false;`
`1635`	`1634`
`1636`	`1635`	`return true;`
`1637`	`1636`	`}`

Comments

(0)