From 65dc1fc99a257a98961bfb964a1a95b2f521cd74 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 2 Oct 2015 12:49:01 -0300 Subject: [PATCH] Don't disable commit_ts in standby if enabled locally Bug noticed by Fujii Masao --- src/backend/access/transam/commit_ts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 79ca04a6ea..24b8291083 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); }