summaryrefslogtreecommitdiff
path: root/src/backend/utils/init/postinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/init/postinit.c')
-rw-r--r--src/backend/utils/init/postinit.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 51cab6f0e8e..f2a5864666c 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.59 2000/05/30 00:49:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.60 2000/06/28 03:32:43 tgl Exp $
*
*
*-------------------------------------------------------------------------
@@ -40,8 +40,6 @@
#include "mb/pg_wchar.h"
#endif
-void BaseInit(void);
-
static void ReverifyMyDatabase(const char *name);
static void InitCommunication(void);
@@ -222,8 +220,6 @@ InitCommunication()
* Be very careful with the order of calls in the InitPostgres function.
* --------------------------------
*/
-extern int NBuffers;
-
int lockingOff = 0; /* backend -L switch */
/*
@@ -405,21 +401,6 @@ InitPostgres(const char *dbname)
void
BaseInit(void)
{
-
- /*
- * Turn on the exception handler. Note: we cannot use elog, Assert,
- * AssertState, etc. until after exception handling is on.
- */
- EnableExceptionHandling(true);
-
- /*
- * Memory system initialization - we may call palloc after
- * EnableMemoryContext()). Note that EnableMemoryContext() must
- * happen before EnablePortalManager().
- */
- EnableMemoryContext(true); /* initializes the "top context" */
- EnablePortalManager(true); /* memory for portal/transaction stuff */
-
/*
* Attach to shared memory and semaphores, and initialize our
* input/output/debugging file descriptors.
@@ -427,4 +408,6 @@ BaseInit(void)
InitCommunication();
DebugFileOpen();
smgrinit();
+
+ EnablePortalManager(); /* memory for portal/transaction stuff */
}