* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.152 2007/04/02 03:49:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.153 2007/08/08 18:07:05 neilc Exp $
*
*-------------------------------------------------------------------------
*/
MemSet(econtext->ecxt_aggvalues, 0, sizeof(Datum) * node->numaggs);
MemSet(econtext->ecxt_aggnulls, 0, sizeof(bool) * node->numaggs);
- /* Release all temp storage */
- MemoryContextReset(node->aggcontext);
+ /*
+ * Release all temp storage. Note that with AGG_HASHED, the hash table
+ * is allocated in a sub-context of the aggcontext. We're going to
+ * rebuild the hash table from scratch, so we need to use
+ * MemoryContextResetAndDeleteChildren() to avoid leaking the old hash
+ * table's memory context header.
+ */
+ MemoryContextResetAndDeleteChildren(node->aggcontext);
if (((Agg *) node->ss.ps.plan)->aggstrategy == AGG_HASHED)
{