From c91b8bc5373719b1dc57e5ae57a99ef554097a25 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 14 Sep 2002 19:59:20 +0000
Subject: [PATCH] Cosmetic fixes from Neil Conway.

---
 src/backend/commands/prepare.c      | 8 ++++----
 src/backend/storage/buffer/bufmgr.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index cf869ed75e..1d2e42b8ce 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2002, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.2 2002/09/04 20:31:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.3 2002/09/14 19:59:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -248,7 +248,7 @@ StoreQuery(const char *stmt_name, List *query_list, List *plan_list,
 		elog(ERROR, "Prepared statement with name \"%s\" already exists",
 			 stmt_name);
 
-	/* Okay. Make a permanent memory context for the hashtable entry */
+	/* Make a permanent memory context for the hashtable entry */
 	entrycxt = AllocSetContextCreate(TopMemoryContext,
 									 stmt_name,
 									 1024,
@@ -399,8 +399,8 @@ DeallocateQuery(DeallocateStmt *stmt)
 			 stmt->name);
 
 	/* Flush the context holding the subsidiary data */
-	if (MemoryContextIsValid(entry->context))
-		MemoryContextDelete(entry->context);
+	Assert(MemoryContextIsValid(entry->context));
+	MemoryContextDelete(entry->context);
 
 	/* Now we can remove the hash table entry */
 	hash_search(prepared_queries, key, HASH_REMOVE, NULL);
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index b6c9112030..6d1e52d522 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.132 2002/09/04 20:31:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.133 2002/09/14 19:59:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -316,7 +316,7 @@ BufferAlloc(Relation reln,
 		{
 			/*
 			 * I couldn't understand the following old comment. If there's
-			 * no IO for the buffer and the buffer is BROKEN,it should be
+			 * no IO for the buffer and the buffer is BROKEN, it should be
 			 * read again. So start a new buffer IO here.
 			 *
 			 * wierd race condition: