database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Revoke 7a5a59d378e052618d6feae64d1d2b4f2ad6f9bc

Browse Source
This commit is contained in:
Simon Riggs 2013-03-28 09:12:55 +00:00
parent 0d1ecd6300
commit d139a5e26b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/misc/guc.c
View File

@ -4187,7 +4187,9 @@ SelectConfigFiles(const char *userDoption, const char *progname)
* Reflect the final DataDir value back into the data_directory GUC var. * 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, * (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 * 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); SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
@ -4203,11 +4205,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
else else
SetRecoveryConfDir(DataDir); 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 * 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 * the default value. We do it this way because we can't safely install a