summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Riggs2013-03-27 16:35:38 +0000
committerSimon Riggs2013-03-27 16:35:38 +0000
commit7a5a59d378e052618d6feae64d1d2b4f2ad6f9bc (patch)
treed99e8935624475d264b388091f0fa9751fd58124 /src
parent7800a71291690dcc34eb3b7aab18750b5a7ebe2c (diff)
Set recovery_config_directory for EXEC_BACKEND.
Remove comment questioning whether this is necessary for DataDir. From buildfarm failures on Windows.
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/misc/guc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 0459dd1c09b..f9fb264adeb 100644
--- 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
- * 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);
@@ -4206,6 +4204,11 @@ SelectConfigFiles(const char *userDoption, const char *progname)
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
* "real" value until my_exec_path is set, which may not have happened