genericcostestimate() neglected to include qual startup cost in

indexTotalCost.  I think this may not make any real difference in 7.4,
but it definitely is a problem with CVS tip's new equation.

diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 59ef66bace302a79b1400916cbcb67edce5d794a..ddede1d654826cea533aa80fb626637c1f43ef44 100644 (file)
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3977,7 +3977,7 @@ genericcostestimate(Query *root, RelOptInfo *rel,
         */
        cost_qual_eval(&index_qual_cost, indexQuals);
        *indexStartupCost = index_qual_cost.startup;
-       *indexTotalCost = numIndexPages +
+       *indexTotalCost = numIndexPages + index_qual_cost.startup +
                (cpu_index_tuple_cost + index_qual_cost.per_tuple) * numIndexTuples;
 
        /*