Repair failure to mark an inserted Materialize node with the appropriate

extParam/locParam lists.  Per bug #526.

diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 9d47b60430aab2c67b94894db3e7059d36a2d2cd..94a198473db635af748c482122513b14840f6c45 100644 (file)
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.49 2001/03/22 03:59:37 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.50 2001/11/30 19:24:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -324,6 +324,12 @@ make_subplan(SubLink *slink)
         * is anything more complicated than a plain sequential scan, and
         * we do it even for seqscan if the qual appears selective enough
         * to eliminate many tuples.
+        *
+        * XXX It's pretty ugly to be inserting a MATERIAL node at this
+        * point.  Since subquery_planner has already run SS_finalize_plan
+        * on the subplan tree, we have to kluge up parameter lists for
+        * the MATERIAL node.  Possibly this could be fixed by postponing
+        * SS_finalize_plan processing until setrefs.c is run.
         */
        if (node->parParam == NIL)
        {
@@ -362,8 +368,13 @@ make_subplan(SubLink *slink)
            }
            if (use_material)
            {
-               plan = (Plan *) make_material(plan->targetlist, plan);
-               node->plan = plan;
+               Plan   *matplan;
+
+               matplan = (Plan *) make_material(plan->targetlist, plan);
+               /* kluge --- see comments above */
+               matplan->extParam = listCopy(plan->extParam);
+               matplan->locParam = listCopy(plan->locParam);
+               node->plan = plan = matplan;
            }
        }