Bugfix

Jan Wieck · Jan Wieck · commit 4ea746a84fbf · 2000-12-14T23:51:35.000Z
Trying to connect to template0 left a global referenced buffer
because the scan of pg_database wasn't ended properly before
elog(FATAL).

Jan
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.74 2000/11/30 08:46:25 vadim Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.75 2000/12/14 23:51:35 wieck Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`@@ -115,8 +115,12 @@ ReverifyMyDatabase(const char *name)`
`115`	`115`	`*/`
`116`	`116`	`dbform = (Form_pg_database) GETSTRUCT(tup);`
`117`	`117`	`if (! dbform->datallowconn)`
	`118`	`+ {`
	`119`	`+ heap_endscan(pgdbscan);`
	`120`	`+ heap_close(pgdbrel, AccessShareLock);`
`118`	`121`	`elog(FATAL, "Database \"%s\" is not currently accepting connections",`
`119`	`122`	`name);`
	`123`	`+ }`
`120`	`124`
`121`	`125`	`/*`
`122`	`126`	`* OK, we're golden. Only other to-do item is to save the MULTIBYTE`