diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-24 03:29:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-24 03:29:15 +0000 |
| commit | 782c16c6a154e760bf1608d633488538cd52da93 (patch) | |
| tree | 902da787593da21a979bd2f74b0b44acf9c427b0 /src/backend/executor/nodeAgg.c | |
| parent | 87523ab8db34859ae3fb980a3fab9f29dfc4c97a (diff) | |
| download | postgresql-782c16c6a154e760bf1608d633488538cd52da93.tar.gz postgresql-782c16c6a154e760bf1608d633488538cd52da93.zip | |
SQL-language functions are now callable in ordinary fmgr contexts ...
for example, an SQL function can be used in a functional index. (I make
no promises about speed, but it'll work ;-).) Clean up and simplify
handling of functions returning sets.
Diffstat (limited to 'src/backend/executor/nodeAgg.c')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 547a946b4ce..fae1a5b0d87 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -34,7 +34,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.70 2000/07/17 03:04:53 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.71 2000/08/24 03:29:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -451,7 +451,6 @@ ExecAgg(Agg *node) TupleTableSlot *resultSlot; HeapTuple inputTuple; int aggno; - bool isDone; bool isNull; /* --------------------- @@ -523,7 +522,7 @@ ExecAgg(Agg *node) Datum newVal; newVal = ExecEvalExpr(aggref->target, econtext, - &isNull, &isDone); + &isNull, NULL); if (aggref->aggdistinct) { @@ -677,8 +676,9 @@ ExecAgg(Agg *node) /* * Form a projection tuple using the aggregate results and the * representative input tuple. Store it in the result tuple slot. + * Note we do not support aggregates returning sets ... */ - resultSlot = ExecProject(projInfo, &isDone); + resultSlot = ExecProject(projInfo, NULL); /* * If the completed tuple does not match the qualifications, it is |