diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execAmi.c | 5 | ||||
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index a1f26d9fc1d..139c95c5911 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execAmi.c,v 1.28 1998/12/14 08:11:02 scrappy Exp $ + * $Id: execAmi.c,v 1.29 1999/01/18 00:09:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,9 @@ #include "executor/nodeNestloop.h" #include "executor/nodeHashjoin.h" #include "executor/nodeHash.h" +/***S*I***/ +#include "executor/nodeGroup.h" + #include "executor/nodeAgg.h" #include "executor/nodeGroup.h" #include "executor/nodeResult.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 0eed756319a..dbb86bb0f7d 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -491,7 +491,10 @@ ExecAgg(Agg *node) * As long as the retrieved group does not match the * qualifications it is ignored and the next group is fetched */ - qual_result = ExecQual(fix_opids(node->plan.qual), econtext); + if(node->plan.qual != NULL){ + qual_result = ExecQual(fix_opids(node->plan.qual), econtext); + } + if (oneTuple) pfree(oneTuple); } |