aboutsummaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootstrap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r--src/backend/bootstrap/bootstrap.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index ad49964732f..6866d92238f 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -397,6 +397,12 @@ AuxiliaryProcessMain(int argc, char *argv[])
proc_exit(1); /* should never return */
case BootstrapProcess:
+ /*
+ * There was a brief instant during which mode was Normal; this is
+ * okay. We need to be in bootstrap mode during BootStrapXLOG for
+ * the sake of multixact initialization.
+ */
+ SetProcessingMode(BootstrapProcessing);
bootstrap_signals();
BootStrapXLOG();
BootstrapModeMain();
@@ -459,8 +465,7 @@ BootstrapModeMain(void)
int i;
Assert(!IsUnderPostmaster);
-
- SetProcessingMode(BootstrapProcessing);
+ Assert(IsBootstrapProcessingMode());
/*
* Do backend-like initialization for bootstrap mode