diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/executor/nodeBitmapHeapscan.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 5d92c19ea5e..38288ec659e 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.4 2005/10/15 02:49:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.4.2.1 2005/12/02 01:30:26 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -442,11 +442,6 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate) ExecInitExpr((Expr *) node->bitmapqualorig, (PlanState *) scanstate); - /* - * initialize child nodes - */ - outerPlanState(scanstate) = ExecInitNode(outerPlan(node), estate); - #define BITMAPHEAPSCAN_NSLOTS 2 /* @@ -497,6 +492,15 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate) ExecAssignScanProjectionInfo(&scanstate->ss); /* + * initialize child nodes + * + * We do this last because the child nodes will open indexscans on our + * relation's indexes, and we want to be sure we have acquired a lock + * on the relation first. + */ + outerPlanState(scanstate) = ExecInitNode(outerPlan(node), estate); + + /* * all done. */ return scanstate; |