OSDN Git Service

Fix error messages for the lack of multi-byte support.
authorTatsuo Ishii <ishii@postgresql.org>
Sun, 23 Jan 2000 08:16:37 +0000 (08:16 +0000)
committerTatsuo Ishii <ishii@postgresql.org>
Sun, 23 Jan 2000 08:16:37 +0000 (08:16 +0000)
Since --with-mb has been removed from configure, previous
messages were not appropriate.

src/backend/parser/gram.y

index 3a673bc..022c364 100644 (file)
@@ -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