diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-12 18:27:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-12 18:27:09 +0000 |
| commit | c1ac3df7343f18590bf095d34668a745e0eeeeee (patch) | |
| tree | 63f81d52662a0425bd9c71e339bdf218a8015f82 /src | |
| parent | c7cca1c8f7e9bfbd81b49107d88aa4a4ca2071d0 (diff) | |
| download | postgresql-c1ac3df7343f18590bf095d34668a745e0eeeeee.tar.gz postgresql-c1ac3df7343f18590bf095d34668a745e0eeeeee.zip | |
Fix mistaken Assert in adjust_appendrel_attr_needed, per Greg Stark.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/optimizer/prep/prepunion.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 44aebd9ed3f..0f77e1d91c8 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -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; |