mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Lane 2002-08-04 23:49:59 +00:00
parent e053d2071d
commit 1be014313a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/catalog/pg_proc.c
View File

@ -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;

9
src/backend/nodes/equalfuncs.c
View File

@ -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;
}