summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera2011-02-15 22:52:32 +0000
committerAlvaro Herrera2011-02-15 22:52:32 +0000
commit8b2557553c6eeba97d9ebf6f048369cabd25c2b6 (patch)
tree642e460133e693c80431f8507efae688f4f2615b
parenteff027c43288d15307676b1bd4736ab11f34c407 (diff)
Make pg_upgrade compile again
-rw-r--r--contrib/pg_upgrade/info.c3
-rw-r--r--contrib/pg_upgrade/pg_upgrade.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index dbbc143fa2..74c9da13c6 100644
--- 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
index e93ac3ba8c..abde25915d 100644
--- 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);