diff options
| author | Bruce Momjian | 1999-03-20 13:18:20 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-03-20 13:18:20 +0000 |
| commit | 0aa2aed5f80be2d6524cdff55d0ea9f6b7c19ee2 (patch) | |
| tree | ff9fa99935f0e7a39f197d0f089414b0db73994c /src/backend | |
| parent | 3ea6c806ebd6b411ee38970c26a3710ec1854382 (diff) | |
Reverse out pfree agg part of patch from Erik Riedel.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 3 | ||||
| -rw-r--r-- | src/backend/parser/gram.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 288e16555e7..d379077af51 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -110,7 +110,6 @@ ExecAgg(Agg *node) isNull2 = FALSE; bool qual_result; - Datum oldVal = (Datum) NULL; /* XXX - so that we can save and free on each iteration - er1p */ /* --------------------- * get state info from node @@ -373,10 +372,8 @@ ExecAgg(Agg *node) */ args[0] = value1[aggno]; args[1] = newVal; - oldVal = value1[aggno]; /* XXX - save so we can free later - er1p */ value1[aggno] = (Datum) fmgr_c(&aggfns->xfn1, (FmgrValues *) args, &isNull1); - pfree(oldVal); /* XXX - new, let's free the old datum - er1p */ Assert(!isNull1); } } diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c index 8bdec93af09..ecdad19c559 100644 --- a/src/backend/parser/gram.c +++ b/src/backend/parser/gram.c @@ -241,7 +241,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.86 1999/03/19 23:48:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.87 1999/03/20 13:18:03 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT |