Set MaxBackends only on bootstrap and standalone modes

alvherre · alvherre · commit 15658911d994 · 2013-01-02T17:57:56.000-03:00
... not on auxiliary processes.  I managed to overlook the fact that I
had disabled assertions on my HEAD checkout long ago.

Hopefully this will turn the buildfarm green again, and put an end to
today's silliness.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -3653,6 +3653,11 @@ PostgresMain(int argc, char *argv[], const char *username)
 		 * Create lockfile for data directory.
 		 */
 		CreateDataDirLockFile(false);
+
+		/* In EXEC_BACKEND, this was set via BackendParameters */
+#ifndef EXEC_BACKEND
+		InitializeMaxBackends();
+#endif
 	}
 
 	/* Early initialization */
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
@@ -453,8 +453,6 @@ InitializeMaxBackends(void)
 void
 BaseInit(void)
 {
-	InitializeMaxBackends();
-
 	/*
 	 * Attach to shared memory and semaphores, and initialize our
 	 * input/output/debugging file descriptors.

Original file line number	Diff line number	Diff line change
`@@ -453,8 +453,6 @@ InitializeMaxBackends(void)`
`453`	`453`	`void`
`454`	`454`	`BaseInit(void)`
`455`	`455`	`{`
`456`		`- InitializeMaxBackends();`
`457`		`-`
`458`	`456`	`/*`
`459`	`457`	`* Attach to shared memory and semaphores, and initialize our`
`460`	`458`	`* input/output/debugging file descriptors.`