From 2605ceb7042442b880ae122a7955206afe91fbb3 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 23 Jan 2000 08:16:37 +0000
Subject: [PATCH] Fix error messages for the lack of multi-byte support. Since
 --with-mb has been removed from configure, previous messages were not
 appropriate.

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

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 3a673bc74bf..022c3649cb7 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.133 2000/01/22 14:20:46 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.134 2000/01/23 08:16:37 ishii Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -50,6 +50,7 @@
 #include "utils/numeric.h"
 
 #ifdef MULTIBYTE
+#include "miscadmin.h"
 #include "mb/pg_wchar.h"
 #endif
 
@@ -2668,7 +2669,7 @@ createdb_opt_encoding:
                 elog(ERROR, "%s is not a valid encoding name.", $3);
             $$ = i;
 #else
-            elog(ERROR, "WITH ENCODING is not supported.");
+            elog(ERROR, "Multi-byte support is not enabled");
 #endif
         }
         | ENCODING '=' Iconst
@@ -2678,7 +2679,7 @@ createdb_opt_encoding:
                 elog(ERROR, "%d is not a valid encoding code.", $3);
             $$ = $3;
 #else
-            elog(ERROR, "WITH ENCODING is not supported.");
+            elog(ERROR, "Multi-byte support is not enabled");
 #endif
         }
         | ENCODING '=' DEFAULT
-- 
GitLab