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.

diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c
index 0eafa0afa2ccccf81ea4258c8d1b7cb8354ee1b8..1f203b4fe6be4e8f271b3fe0989198bb9c954506 100644 (file)
--- 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 */