]> granicus.if.org Git - postgresql/commitdiff
Fix mistaken Assert in adjust_appendrel_attr_needed, per Greg Stark.
authorTom Lane <tgl@sss.pgh.pa.us>
Thu, 12 Jul 2007 18:27:09 +0000 (18:27 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Thu, 12 Jul 2007 18:27:09 +0000 (18:27 +0000)
src/backend/optimizer/prep/prepunion.c

index 44aebd9ed3f44503f7bf752617692223c1200c7b..0f77e1d91c8c65a2409ba6ece3a6ff5947ebcd02 100644 (file)
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.134 2006/10/04 00:29:55 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.134.2.1 2007/07/12 18:27:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1283,8 +1283,6 @@ adjust_appendrel_attr_needed(RelOptInfo *oldrel, AppendRelInfo *appinfo,
        ListCell   *lm;
 
        /* Create empty result array */
-       Assert(new_min_attr <= oldrel->min_attr);
-       Assert(new_max_attr >= oldrel->max_attr);
        new_attr_needed = (Relids *)
                palloc0((new_max_attr - new_min_attr + 1) * sizeof(Relids));
        /* Process user attributes, with appropriate attno mapping */
@@ -1307,6 +1305,7 @@ adjust_appendrel_attr_needed(RelOptInfo *oldrel, AppendRelInfo *appinfo,
                parent_attr++;
        }
        /* Process system attributes, including whole-row references */
+       Assert(new_min_attr <= oldrel->min_attr);
        for (parent_attr = oldrel->min_attr; parent_attr <= 0; parent_attr++)
        {
                Relids          attrneeded;