Make pg_upgrade compile again

15 years ago · 8b2557553c
parent eff027c432
commit 8b2557553c
2 changed files with 3 additions and 2 deletions
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@ -147,8 +147,7 @@ get_db_and_rel_infos(ClusterInfo *cluster)
 {
 	int			dbnum;

-	if (cluster->dbarr)
-		free_db_and_rel_infos(cluster->dbarr);
+	free_db_and_rel_infos(&cluster->dbarr);

 	get_db_infos(cluster);

--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@ -64,6 +64,8 @@ main(int argc, char **argv)
 	bool		live_check = false;

 	parseCommandLine(argc, argv);
+	old_cluster.dbarr.ndbs = 0;
+	new_cluster.dbarr.ndbs = 0;

 	output_check_banner(&live_check);