From d139a5e26b0d1123d77c403e2e95feaf77634a40 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Thu, 28 Mar 2013 09:12:55 +0000 Subject: [PATCH] Revoke 7a5a59d378e052618d6feae64d1d2b4f2ad6f9bc --- src/backend/utils/misc/guc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index f9fb264adeb..0459dd1c09b 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4187,7 +4187,9 @@ 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. + * 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.) */ SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE); @@ -4203,11 +4205,6 @@ SelectConfigFiles(const char *userDoption, const char *progname) 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