diff options
| author | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
|---|---|---|
| committer | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
| commit | e0c3b474d5436c7874aef36988f2646bdb890249 (patch) | |
| tree | 49c41d2b8abbd9bae4096643d840859f3a02a08c /src/include/utils | |
| parent | 40cefa392974c73ec20deb3c15fb5111ed7fad17 (diff) | |
| parent | 9bb6d9795253bb521f81c626fea49a704a369ca9 (diff) | |
Merge branch 'master' into analyze_cacheanalyze_cache
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/guc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 5a42d8cec3..ee52cd735e 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -82,7 +82,8 @@ typedef enum */ typedef enum { - PGC_S_DEFAULT, /* wired-in default */ + PGC_S_DEFAULT, /* hard-wired default ("boot_val") */ + PGC_S_DYNAMIC_DEFAULT, /* default computed during initialization */ PGC_S_ENV_VAR, /* postmaster environment variable */ PGC_S_FILE, /* postgresql.conf */ PGC_S_ARGV, /* postmaster command line */ |