In pg_upgrade, use full path name for analyze_new_cluster.sh script.

Backpatch to 9.2.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index e4fec34195e54b782fbee72897ce6fc325d6e06a..e9e9a4fe339a50bb896c7edf0e19e9d36bcc42e9 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -500,7 +500,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
                        ECHO_QUOTE, ECHO_QUOTE);
        fprintf(script, "echo %sthis script and run:%s\n",
                        ECHO_QUOTE, ECHO_QUOTE);
-       fprintf(script, "echo %s    vacuumdb --all %s%s\n", ECHO_QUOTE,
+       fprintf(script, "echo %s    \"%s/vacuumdb\" --all %s%s\n", ECHO_QUOTE, new_cluster.bindir,
        /* Did we copy the free space files? */
                        (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
                        "--analyze-only" : "--analyze", ECHO_QUOTE);
@@ -521,7 +521,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
                        ECHO_QUOTE, ECHO_QUOTE);
        fprintf(script, "echo %s--------------------------------------------------%s\n",
                        ECHO_QUOTE, ECHO_QUOTE);
-       fprintf(script, "vacuumdb --all --analyze-only\n");
+       fprintf(script, "\"%s/vacuumdb\" --all --analyze-only\n", new_cluster.bindir);
        fprintf(script, "echo%s\n", ECHO_BLANK);
        fprintf(script, "echo %sThe server is now available with minimal optimizer statistics.%s\n",
                        ECHO_QUOTE, ECHO_QUOTE);
@@ -542,7 +542,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
                        ECHO_QUOTE, ECHO_QUOTE);
        fprintf(script, "echo %s---------------------------------------------------%s\n",
                        ECHO_QUOTE, ECHO_QUOTE);
-       fprintf(script, "vacuumdb --all --analyze-only\n");
+       fprintf(script, "\"%s/vacuumdb\" --all --analyze-only\n", new_cluster.bindir);
        fprintf(script, "echo%s\n\n", ECHO_BLANK);
 
 #ifndef WIN32
@@ -555,7 +555,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
                        ECHO_QUOTE, ECHO_QUOTE);
        fprintf(script, "echo %s-------------------------------------------------------------%s\n",
                        ECHO_QUOTE, ECHO_QUOTE);
-       fprintf(script, "vacuumdb --all %s\n",
+       fprintf(script, "\"%s/vacuumdb\" --all %s\n", new_cluster.bindir,
        /* Did we copy the free space files? */
                        (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
                        "--analyze-only" : "--analyze");