From e4d495a20b0aa1b9f88df07e6011003a2c2ad700 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 Jul 2010 17:22:03 +0000 Subject: [PATCH] Fix oversight in new EvalPlanQual logic: the second loop over the ExecRowMark list in ExecLockRows() forgot to allow for the possibility that some of the rowmarks are for child tables that aren't relevant to the current row. Per report from Kenichiro Tanaka. --- src/backend/executor/nodeLockRows.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c index 0eafa0afa2c..1f203b4fe6b 100644 --- a/src/backend/executor/nodeLockRows.c +++ b/src/backend/executor/nodeLockRows.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeLockRows.c,v 1.4 2010/02/26 02:00:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeLockRows.c,v 1.4.4.1 2010/07/28 17:22:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -195,6 +195,13 @@ lnext: HeapTupleData tuple; Buffer buffer; + /* ignore non-active child tables */ + if (!ItemPointerIsValid(&(erm->curCtid))) + { + Assert(erm->rti != erm->prti); /* check it's child table */ + continue; + } + if (EvalPlanQualGetTuple(&node->lr_epqstate, erm->rti) != NULL) continue; /* it was updated and fetched above */ -- 2.39.5