From 0b44238841c348c11a962643605a5aa442f22a70 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 4 Aug 1998 17:37:48 +0000
Subject: [PATCH] Fix encoding grammer problem.

---
 src/backend/parser/gram.y | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 0d3924590e..db4c9344d4 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.19 1998/07/26 04:30:31 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.20 1998/08/04 17:37:48 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2094,7 +2094,8 @@ CreatedbStmt:  CREATE DATABASE database_name WITH opt_database1 opt_database2
 						n->encoding = GetTemplateEncoding();
 					}
 #else
-					elog(ERROR, "WITH ENCODING is not supported");
+					if ($6 != NULL)
+						elog(ERROR, "WITH ENCODING is not supported");
 #endif
 					$$ = (Node *)n;
 				}