diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2015-10-02 12:49:01 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2015-10-02 12:49:01 -0300 |
| commit | 65dc1fc99a257a98961bfb964a1a95b2f521cd74 (patch) | |
| tree | 250199dcad696f88a2379df12f232bb1d5134c7c /src/backend/access/transam/commit_ts.c | |
| parent | 0f51a848ab98325e497a227155648facd9d0cf9b (diff) | |
| download | postgresql-65dc1fc99a257a98961bfb964a1a95b2f521cd74.tar.gz postgresql-65dc1fc99a257a98961bfb964a1a95b2f521cd74.zip | |
Don't disable commit_ts in standby if enabled locally
Bug noticed by Fujii Masao
Diffstat (limited to 'src/backend/access/transam/commit_ts.c')
| -rw-r--r-- | src/backend/access/transam/commit_ts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 79ca04a6eaf..24b82910835 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -583,14 +583,15 @@ CommitTsParameterChange(bool newvalue, bool oldvalue) * pg_control. If the old value was already set, we already did this, so * don't do anything. * - * If the module is disabled in the master, disable it here too. + * If the module is disabled in the master, disable it here too, unless + * the module is enabled locally. */ if (newvalue) { if (!track_commit_timestamp && !oldvalue) ActivateCommitTs(); } - else if (oldvalue) + else if (!track_commit_timestamp && oldvalue) DeactivateCommitTs(false); } |