diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2013-03-28 09:12:55 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2013-03-28 09:12:55 +0000 |
| commit | d139a5e26b0d1123d77c403e2e95feaf77634a40 (patch) | |
| tree | 20ff4f8ea6fe143229a3ee15ad5cd978e28a56b3 /src | |
| parent | 0d1ecd6300191a450978ca2fcd12bbbb7c5e65e6 (diff) | |
| download | postgresql-d139a5e26b0d1123d77c403e2e95feaf77634a40.tar.gz postgresql-d139a5e26b0d1123d77c403e2e95feaf77634a40.zip | |
Revoke 7a5a59d378e052618d6feae64d1d2b4f2ad6f9bc
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 9 |
1 files 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); @@ -4204,11 +4206,6 @@ 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 |