Set recovery_config_directory for EXEC_BACKEND.

Remove comment questioning whether this is necessary for DataDir.
From buildfarm failures on Windows.

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 0459dd1c09bc7bf1c981a98cc484185ee27b72aa..f9fb264adebf3efc4a115d504217166a70578f29 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4187,9 +4187,7 @@ SelectConfigFiles(const char *userDoption, const char *progname)
         * Reflect the final DataDir value back into the data_directory GUC var.
         * (If you are wondering why we don't just make them a single variable,
         * it's because the EXEC_BACKEND case needs DataDir to be transmitted to
         * Reflect the final DataDir value back into the data_directory GUC var.
         * (If you are wondering why we don't just make them a single variable,
         * it's because the EXEC_BACKEND case needs DataDir to be transmitted to

-        * child backends specially.  XXX is that still true?  Given that we now
-        * chdir to DataDir, EXEC_BACKEND can read the config file without knowing
-        * DataDir in advance.)
+        * child backends specially.

         */
        SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
 
         */
        SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
 


@@ -4205,6 +4203,11 @@ SelectConfigFiles(const char *userDoption, const char *progname)
        else
                SetRecoveryConfDir(DataDir);
 
        else
                SetRecoveryConfDir(DataDir);
 

+       /*
+        * Reflect the final RecoveryConfDir value back into the GUC var, as above.
+        */
+       SetConfigOption("recovery_config_directory", RecoveryConfDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
+

        /*
         * If timezone_abbreviations wasn't set in the configuration file, install
         * the default value.  We do it this way because we can't safely install a
        /*
         * If timezone_abbreviations wasn't set in the configuration file, install
         * the default value.  We do it this way because we can't safely install a