database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Revoke bc5334d867

Browse Source
This commit is contained in:
Simon Riggs
2013-03-28 09:18:02 +00:00
parent d139a5e26b
commit 593c39d156
7 changed files with 7 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/utils/init/globals.c
View File

@ -46,7 +46,6 @@ int MyPMChildSlot;
* explicitly.
*/
char *DataDir = NULL;
char *RecoveryConfDir = NULL;
char OutputFileName[MAXPGPATH]; /* debugging output file */

19
src/backend/utils/init/miscinit.c
View File

@ -99,25 +99,6 @@ SetDataDir(const char *dir)
DataDir = new;
}
/*
* 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

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

@ -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;
@ -2961,17 +2960,6 @@ static struct config_string ConfigureNamesString[] =
NULL, NULL, NULL
},
{
{"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."),
@ -4193,18 +4181,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