diff options
| -rw-r--r-- | contrib/pg_upgrade/exec.c | 18 | ||||
| -rw-r--r-- | contrib/pg_upgrade/option.c | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 455d7ac45d6..af0fcf93a95 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -14,7 +14,7 @@ static void check_data_dir(const char *pg_data); -static void check_bin_dir(ClusterInfo *cluster); +static void check_bin_dir(ClusterInfo *cluster, Cluster whichCluster); static int check_exec(const char *dir, const char *cmdName); static const char *validate_exec(const char *path); @@ -99,7 +99,7 @@ verify_directories(void) check_ok(); prep_status("Checking old bin directory (%s)", old_cluster.bindir); - check_bin_dir(&old_cluster); + check_bin_dir(&old_cluster, CLUSTER_OLD); check_ok(); prep_status("Checking new data directory (%s)", new_cluster.pgdata); @@ -107,7 +107,7 @@ verify_directories(void) check_ok(); prep_status("Checking new bin directory (%s)", new_cluster.bindir); - check_bin_dir(&new_cluster); + check_bin_dir(&new_cluster, CLUSTER_NEW); check_ok(); } @@ -158,12 +158,18 @@ check_data_dir(const char *pg_data) * exit(). */ static void -check_bin_dir(ClusterInfo *cluster) +check_bin_dir(ClusterInfo *cluster, Cluster whichCluster) { check_exec(cluster->bindir, "postgres"); - check_exec(cluster->bindir, "psql"); check_exec(cluster->bindir, "pg_ctl"); - check_exec(cluster->bindir, "pg_dumpall"); + check_exec(cluster->bindir, "pg_resetxlog"); + if (whichCluster == CLUSTER_NEW) + { + /* these are only needed in the new cluster */ + check_exec(cluster->bindir, "pg_config"); + check_exec(cluster->bindir, "psql"); + check_exec(cluster->bindir, "pg_dumpall"); + } } diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index e63bc85bc1f..f6b57065374 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -310,7 +310,11 @@ validateDirectoryOption(char **dirpath, static void get_pkglibdirs(void) { - old_cluster.libpath = get_pkglibdir(old_cluster.bindir); + /* + * we do not need to know the libpath in the old cluster, and might not + * have a working pg_config to ask for it anyway. + */ + old_cluster.libpath = NULL; new_cluster.libpath = get_pkglibdir(new_cluster.bindir); } |