diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-29 11:57:33 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-29 11:57:33 -0400 |
commit | da33a3894e0fc440ac53cdc0f2e360e703b13b8c (patch) | |
tree | c003e9fb63647d9467964d137688bce2d087fc77 /src/include/utils/guc.h | |
parent | d8179b001ae574da00c8f4549577095bf90f3337 (diff) |
Revert exporting of internal GUC variable "data_directory".
This undoes a poorly-thought-out choice in commit 970a18687f9b3058, namely
to export guc.c's internal variable data_directory. The authoritative
variable so far as C code is concerned is DataDir; there is no reason for
anything except specific bits of GUC code to look at the GUC variable.
After yesterday's commits fixing the fsync-on-restart patch, the only
remaining misuse of data_directory was in AlterSystemSetConfigFile(),
which would be much better off just using a relative path anyhow: it's
less code and it doesn't break if the DBA moves the data directory of a
running system, which is a case we've taken some pains over in the past.
This is mostly cosmetic, so no need for a back-patch (and I'd be hesitant
to remove a global variable in stable branches anyway).
Diffstat (limited to 'src/include/utils/guc.h')
-rw-r--r-- | src/include/utils/guc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index a8191c94c39..ffe1168ccc1 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -247,7 +247,6 @@ extern int temp_file_limit; extern int num_temp_buffers; extern char *cluster_name; -extern char *data_directory; extern char *ConfigFileName; extern char *HbaFileName; extern char *IdentFileName; |