Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 41a4f64

Browse files
committed
Fix for aggreg problem and fmgr.c compile problems.
1 parent d876c25 commit 41a4f64

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/backend/executor/nodeAgg.c

+1
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ ExecAgg(Agg *node)
128128
for (i = 0; i < nagg; i++)
129129
{
130130
aggregates[i] = lfirst(alist);
131+
aggregates[i]->aggno = i;
131132
alist = lnext(alist);
132133
}
133134

src/backend/utils/fmgr/fmgr.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.10 1998/01/15 19:45:58 pgsql Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.11 1998/01/15 22:31:33 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <stdio.h>
1515
#include <stdarg.h>
16+
#include <string.h>
1617

1718
#include "postgres.h"
1819

@@ -81,7 +82,7 @@ fmgr_c(FmgrInfo *finfo,
8182
* Untrusted functions have very limited use and is clumsy. We
8283
* just get rid of it.
8384
*/
84-
elog(WARN, "internal error: untrusted function not supported.");
85+
elog(ERROR, "internal error: untrusted function not supported.");
8586
}
8687

8788
/*
@@ -159,7 +160,6 @@ fmgr_c(FmgrInfo *finfo,
159160
void
160161
fmgr_info(Oid procedureId, FmgrInfo *finfo)
161162
{
162-
func_ptr user_fn = NULL;
163163
FmgrCall *fcp;
164164
HeapTuple procedureTuple;
165165
FormData_pg_proc *procedureStruct;
@@ -195,7 +195,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
195195
finfo->fn_addr =
196196
fmgr_lookupByName(procedureStruct->proname.data);
197197
if (!finfo->fn_addr)
198-
elog(WARN, "fmgr_info: function %s: not in internal table",
198+
elog(ERROR, "fmgr_info: function %s: not in internal table",
199199
procedureStruct->proname.data);
200200
break;
201201
case ClanguageId:

0 commit comments

Comments
 (0)