aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-07-12 18:27:01 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-07-12 18:27:01 +0000
commitbc8d164d066f677b5ef3b9c68e821710b0650023 (patch)
treebcb11d54c33652c2940b330d0ef42f53f5d806f1 /src
parent017f2d2f18eca4eb0bf08f686c9e88c83b27fa9f (diff)
downloadpostgresql-bc8d164d066f677b5ef3b9c68e821710b0650023.tar.gz
postgresql-bc8d164d066f677b5ef3b9c68e821710b0650023.zip
Fix mistaken Assert in adjust_appendrel_attr_needed, per Greg Stark.
Diffstat (limited to 'src')
-rw-r--r--src/backend/optimizer/prep/prepunion.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 5e80dc1559a..2dc293b74d1 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.142 2007/06/11 01:16:23 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.143 2007/07/12 18:27:01 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1288,8 +1288,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 */
@@ -1312,6 +1310,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;