Commit 0aa2aed5 authored by Bruce Momjian's avatar Bruce Momjian

Reverse out pfree agg part of patch from Erik Riedel.

parent 3ea6c806
...@@ -110,7 +110,6 @@ ExecAgg(Agg *node) ...@@ -110,7 +110,6 @@ ExecAgg(Agg *node)
isNull2 = FALSE; isNull2 = FALSE;
bool qual_result; bool qual_result;
Datum oldVal = (Datum) NULL; /* XXX - so that we can save and free on each iteration - er1p */
/* --------------------- /* ---------------------
* get state info from node * get state info from node
...@@ -373,10 +372,8 @@ ExecAgg(Agg *node) ...@@ -373,10 +372,8 @@ ExecAgg(Agg *node)
*/ */
args[0] = value1[aggno]; args[0] = value1[aggno];
args[1] = newVal; args[1] = newVal;
oldVal = value1[aggno]; /* XXX - save so we can free later - er1p */
value1[aggno] = (Datum) fmgr_c(&aggfns->xfn1, value1[aggno] = (Datum) fmgr_c(&aggfns->xfn1,
(FmgrValues *) args, &isNull1); (FmgrValues *) args, &isNull1);
pfree(oldVal); /* XXX - new, let's free the old datum - er1p */
Assert(!isNull1); Assert(!isNull1);
} }
} }
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
* *
* *
* IDENTIFICATION * 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 * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment