diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-04 23:49:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-04 23:49:59 +0000 |
| commit | 1be014313a81b85ad930d317d60ddc8462f2a1ee (patch) | |
| tree | f586d8150f89ffaccb46603019f12e153245b9f5 /src | |
| parent | e053d2071d7e8db745fb54b3e633c41dd8c7422c (diff) | |
| download | postgresql-1be014313a81b85ad930d317d60ddc8462f2a1ee.tar.gz postgresql-1be014313a81b85ad930d317d60ddc8462f2a1ee.zip | |
Fix merge failures for anonymous-type patch. From Joe Conway.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/pg_proc.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/equalfuncs.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 64a925ad1a2..a4dfc7fe295 100644 --- 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 683e859227e..e87e9f4f94a 100644 --- 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; } |