Make pg_upgrade compile again

alvherre · alvherre · commit 8b2557553c6e · 2011-02-15T19:52:32.000-03:00
diff --git 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);
 
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ get_db_and_rel_infos(ClusterInfo *cluster)`
`147`	`147`	`{`
`148`	`148`	`int dbnum;`
`149`	`149`
`150`		`- if (cluster->dbarr)`
`151`		`- free_db_and_rel_infos(cluster->dbarr);`
	`150`	`+ free_db_and_rel_infos(&cluster->dbarr);`
`152`	`151`
`153`	`152`	`get_db_infos(cluster);`
`154`	`153`