aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Wieck <JanWieck@Yahoo.com>2000-12-14 23:51:35 +0000
committerJan Wieck <JanWieck@Yahoo.com>2000-12-14 23:51:35 +0000
commit4ea746a84fbf8fc749f21b27d3b8eb3ef4fe0dda (patch)
treeeaea63ca40156e91e619b466e920f5c324960a94
parentc3641483c31112409af28800385455d36108629d (diff)
downloadpostgresql-4ea746a84fbf8fc749f21b27d3b8eb3ef4fe0dda.tar.gz
postgresql-4ea746a84fbf8fc749f21b27d3b8eb3ef4fe0dda.zip
Bugfix
Trying to connect to template0 left a global referenced buffer because the scan of pg_database wasn't ended properly before elog(FATAL). Jan
-rw-r--r--src/backend/utils/init/postinit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index fd477aab28a..f213e561c1b 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.74 2000/11/30 08:46:25 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.75 2000/12/14 23:51:35 wieck Exp $
*
*
*-------------------------------------------------------------------------
@@ -115,8 +115,12 @@ ReverifyMyDatabase(const char *name)
*/
dbform = (Form_pg_database) GETSTRUCT(tup);
if (! dbform->datallowconn)
+ {
+ heap_endscan(pgdbscan);
+ heap_close(pgdbrel, AccessShareLock);
elog(FATAL, "Database \"%s\" is not currently accepting connections",
name);
+ }
/*
* OK, we're golden. Only other to-do item is to save the MULTIBYTE