Commit7a5a59d

committed

Set recovery_config_directory for EXEC_BACKEND.

Remove comment questioning whether this is necessary for DataDir.From buildfarm failures on Windows.

1 parent7800a71 commit7a5a59dCopy full SHA for 7a5a59d

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4187,9 +4187,7 @@ SelectConfigFiles(const char userDoption, const char progname)`
`4187`	`4187`	`* Reflect the final DataDir value back into the data_directory GUC var.`
`4188`	`4188`	`* (If you are wondering why we don't just make them a single variable,`
`4189`	`4189`	`* it's because the EXEC_BACKEND case needs DataDir to be transmitted to`
`4190`		`- * child backends specially. XXX is that still true? Given that we now`
`4191`		`- * chdir to DataDir, EXEC_BACKEND can read the config file without knowing`
`4192`		`- * DataDir in advance.)`
	`4190`	`+ * child backends specially.`
`4193`	`4191`	`*/`
`4194`	`4192`	`SetConfigOption("data_directory",DataDir,PGC_POSTMASTER,PGC_S_OVERRIDE);`
`4195`	`4193`
`@@ -4205,6 +4203,11 @@ SelectConfigFiles(const char userDoption, const char progname)`
`4205`	`4203`	`else`
`4206`	`4204`	`SetRecoveryConfDir(DataDir);`
`4207`	`4205`
	`4206`	`+/*`
	`4207`	`+ * Reflect the final RecoveryConfDir value back into the GUC var, as above.`
	`4208`	`+ */`
	`4209`	`+SetConfigOption("recovery_config_directory",RecoveryConfDir,PGC_POSTMASTER,PGC_S_OVERRIDE);`
	`4210`	`+`
`4208`	`4211`	`/*`
`4209`	`4212`	`* If timezone_abbreviations wasn't set in the configuration file, install`
`4210`	`4213`	`* the default value. We do it this way because we can't safely install a`

Comments

(0)