Attempt to fix compiler warning on old compiler

petere · petere · commit b449afb582bb · 2022-07-16T13:45:57.000+02:00
Build farm member lapwing (using gcc 4.7.2) didn't like one part of 9fd4587, raising a compiler warning. Revert that for now.
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
@@ -2926,12 +2926,13 @@ cost_agg(Path *path, PlannerInfo *root,
 	double		output_tuples;
 	Cost		startup_cost;
 	Cost		total_cost;
-	const AggClauseCosts dummy_aggcosts = {0};
+	AggClauseCosts dummy_aggcosts;
 
 	/* Use all-zero per-aggregate costs if NULL is passed */
 	if (aggcosts == NULL)
 	{
 		Assert(aggstrategy == AGG_HASHED);
+		MemSet(&dummy_aggcosts, 0, sizeof(AggClauseCosts));
 		aggcosts = &dummy_aggcosts;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2926,12 +2926,13 @@ cost_agg(Path path, PlannerInfo root,`
`2926`	`2926`	`double output_tuples;`
`2927`	`2927`	`Cost startup_cost;`
`2928`	`2928`	`Cost total_cost;`
`2929`		`- const AggClauseCosts dummy_aggcosts = {0};`
	`2929`	`+ AggClauseCosts dummy_aggcosts;`
`2930`	`2930`
`2931`	`2931`	`/* Use all-zero per-aggregate costs if NULL is passed */`
`2932`	`2932`	`if (aggcosts == NULL)`
`2933`	`2933`	`{`
`2934`	`2934`	`Assert(aggstrategy == AGG_HASHED);`
	`2935`	`+ MemSet(&dummy_aggcosts, 0, sizeof(AggClauseCosts));`
`2935`	`2936`	`aggcosts = &dummy_aggcosts;`
`2936`	`2937`	`}`
`2937`	`2938`