diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/init/globals.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 19 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 24 |
3 files changed, 0 insertions, 44 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 8bf70219173..9f51929191d 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -46,7 +46,6 @@ int MyPMChildSlot; * explicitly. */ char *DataDir = NULL; -char *RecoveryConfDir = NULL; char OutputFileName[MAXPGPATH]; /* debugging output file */ diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 3d48eb8c9d3..24ca97d55c7 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -100,25 +100,6 @@ SetDataDir(const char *dir) } /* - * Set recovery config directory, but make sure it's an absolute path. Use this, - * never set RecoveryConfDir directly. - */ -void -SetRecoveryConfDir(const char *dir) -{ - char *new; - - AssertArg(dir); - - /* If presented path is relative, convert to absolute */ - new = make_absolute_path(dir); - - if (RecoveryConfDir) - free(RecoveryConfDir); - RecoveryConfDir = new; -} - -/* * Change working directory to DataDir. Most of the postmaster and backend * code assumes that we are in DataDir so it can use relative paths to access * stuff in and under the data directory. For convenience during path 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 |