From 8b2557553c6eeba97d9ebf6f048369cabd25c2b6 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Tue, 15 Feb 2011 19:52:32 -0300
Subject: [PATCH] Make pg_upgrade compile again
---
contrib/pg_upgrade/info.c | 3 +--
contrib/pg_upgrade/pg_upgrade.c | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index dbbc143fa2d..74c9da13c67 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 e93ac3ba8c5..abde25915dc 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);
--
GitLab