diff options
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/fmgr.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 91c5e43b613..a319f9d6cf2 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -128,6 +128,7 @@ ExecAgg(Agg *node) for (i = 0; i < nagg; i++) { aggregates[i] = lfirst(alist); + aggregates[i]->aggno = i; alist = lnext(alist); } diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 6a11bda292c..08302c34170 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -7,12 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.10 1998/01/15 19:45:58 pgsql Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.11 1998/01/15 22:31:33 momjian Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> #include <stdarg.h> +#include <string.h> #include "postgres.h" @@ -81,7 +82,7 @@ fmgr_c(FmgrInfo *finfo, * Untrusted functions have very limited use and is clumsy. We * just get rid of it. */ - elog(WARN, "internal error: untrusted function not supported."); + elog(ERROR, "internal error: untrusted function not supported."); } /* @@ -159,7 +160,6 @@ fmgr_c(FmgrInfo *finfo, void fmgr_info(Oid procedureId, FmgrInfo *finfo) { - func_ptr user_fn = NULL; FmgrCall *fcp; HeapTuple procedureTuple; FormData_pg_proc *procedureStruct; @@ -195,7 +195,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo) finfo->fn_addr = fmgr_lookupByName(procedureStruct->proname.data); if (!finfo->fn_addr) - elog(WARN, "fmgr_info: function %s: not in internal table", + elog(ERROR, "fmgr_info: function %s: not in internal table", procedureStruct->proname.data); break; case ClanguageId: |