summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2015-06-07 22:30:26 +0000
committerAndres Freund2015-06-08 12:09:46 +0000
commit0db10d4e92b655dbb3cb3a08830783107e5f9e60 (patch)
tree424ececf5e586350c587e43328d0371264353a9d
parentbe25a08a9140c9641e8c49780cebdd9e1cf3ad28 (diff)
Allow HotStandbyActiveInReplay() to be called in single user mode.
HotStandbyActiveInReplay, introduced in 061b079f, only allowed WAL replay to happen in the startup process, missing the single user case. This buglet is fairly harmless as it only causes problems when single user mode in an assertion enabled build is used to replay a btree vacuum record. Backpatch to 9.2. 061b079f was backpatched further, but the assertion was not.
-rw-r--r--src/backend/access/transam/xlog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index a699ff8b567..d1b381101b6 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7575,7 +7575,7 @@ HotStandbyActive(void)
bool
HotStandbyActiveInReplay(void)
{
- Assert(AmStartupProcess());
+ Assert(AmStartupProcess() || !IsPostmasterEnvironment);
return LocalHotStandbyActive;
}