Commit e06b2e1d authored by Alvaro Herrera's avatar Alvaro Herrera

Don't disable commit_ts in standby if enabled locally

Bug noticed by Fujii Masao
parent cdcae2b6
...@@ -583,14 +583,15 @@ CommitTsParameterChange(bool newvalue, bool oldvalue) ...@@ -583,14 +583,15 @@ CommitTsParameterChange(bool newvalue, bool oldvalue)
* pg_control. If the old value was already set, we already did this, so * pg_control. If the old value was already set, we already did this, so
* don't do anything. * 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 (newvalue)
{ {
if (!track_commit_timestamp && !oldvalue) if (!track_commit_timestamp && !oldvalue)
ActivateCommitTs(); ActivateCommitTs();
} }
else if (oldvalue) else if (!track_commit_timestamp && oldvalue)
DeactivateCommitTs(false); DeactivateCommitTs(false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment