diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2013-03-28 09:18:02 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2013-03-28 09:18:02 +0000 |
| commit | 593c39d156fd13e07dbfc43e63b53a3e89e82aa4 (patch) | |
| tree | 2dff7756214014c92fc0c43436d2f8cacc8a52b0 /src/backend/utils/misc/guc.c | |
| parent | d139a5e26b0d1123d77c403e2e95feaf77634a40 (diff) | |
| download | postgresql-593c39d156fd13e07dbfc43e63b53a3e89e82aa4.tar.gz postgresql-593c39d156fd13e07dbfc43e63b53a3e89e82aa4.zip | |
Revoke bc5334d8679c428a709d150666b288171795bd76
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 0459dd1c09b..22ba35fef93 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -424,7 +424,6 @@ int temp_file_limit = -1; int num_temp_buffers = 1024; char *data_directory; -char *recovery_config_directory; char *ConfigFileName; char *HbaFileName; char *IdentFileName; @@ -2962,17 +2961,6 @@ static struct config_string ConfigureNamesString[] = }, { - {"recovery_config_directory", PGC_POSTMASTER, FILE_LOCATIONS, - gettext_noop("Sets the server's recovery configuration directory."), - NULL, - GUC_SUPERUSER_ONLY - }, - &recovery_config_directory, - NULL, - NULL, NULL, NULL - }, - - { {"config_file", PGC_POSTMASTER, FILE_LOCATIONS, gettext_noop("Sets the server's main configuration file."), NULL, @@ -4194,18 +4182,6 @@ SelectConfigFiles(const char *userDoption, const char *progname) SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE); /* - * If the recovery_config_directory GUC variable has been set, use that, - * otherwise use DataDir. - * - * Note: SetRecoveryConfDir will copy and absolute-ize its argument, - * so we don't have to. - */ - if (recovery_config_directory) - SetRecoveryConfDir(recovery_config_directory); - else - SetRecoveryConfDir(DataDir); - - /* * 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 |