diff options
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
| -rw-r--r-- | src/backend/executor/nodeMergejoin.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 43a464f1bfc..6aeab2122a4 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.76 2005/11/22 18:17:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.77 2006/02/28 04:10:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1466,10 +1466,13 @@ ExecMergeJoin(MergeJoinState *node) * ---------------------------------------------------------------- */ MergeJoinState * -ExecInitMergeJoin(MergeJoin *node, EState *estate) +ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags) { MergeJoinState *mergestate; + /* check for unsupported flags */ + Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK))); + MJ1_printf("ExecInitMergeJoin: %s\n", "initializing node"); @@ -1512,9 +1515,12 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate) /* * initialize child nodes + * + * inner child must support MARK/RESTORE. */ - outerPlanState(mergestate) = ExecInitNode(outerPlan(node), estate); - innerPlanState(mergestate) = ExecInitNode(innerPlan(node), estate); + outerPlanState(mergestate) = ExecInitNode(outerPlan(node), estate, eflags); + innerPlanState(mergestate) = ExecInitNode(innerPlan(node), estate, + eflags | EXEC_FLAG_MARK); #define MERGEJOIN_NSLOTS 4 |