diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
| commit | 5979d7384179a41390c1ed122c6cc60d30287e2a (patch) | |
| tree | 5c45522ec5301eefd17f5439c216f9e628b60d3f /src/backend/parser | |
| parent | 74b30a3a1f96eb58e7cca0a92fb00bce7e825fbe (diff) | |
| download | postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.tar.gz | |
From: t-ishii@sra.co.jp
As Bruce mentioned, this is due to the conflict among changes we made.
Included patches should fix the problem(I changed all MB to
MULTIBYTE). Please let me know if you have further problem.
P.S. I did not include pathces to configure and gram.c to save the
file size(configure.in and gram.y modified).
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 2ee71b7380..8fb817c91f 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -4,7 +4,7 @@ # Makefile for parser # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.18 1998/07/24 03:31:21 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.19 1998/07/26 04:30:30 scrappy Exp $ # #------------------------------------------------------------------------- @@ -17,8 +17,8 @@ ifeq ($(CC), gcc) CFLAGS+= -Wno-error endif -ifdef MB -CFLAGS+= -DMB=$(MB) +ifdef MULTIBYTE +CFLAGS+= $(MBFLAGS) endif OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \ diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index bb06c854f7..0d3924590e 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.18 1998/07/26 01:18:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.19 1998/07/26 04:30:31 scrappy Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -46,7 +46,7 @@ #include "utils/elog.h" #include "access/xact.h" -#ifdef MB +#ifdef MULTIBYTE #include "mb/pg_wchar.h" #endif @@ -2084,7 +2084,7 @@ CreatedbStmt: CREATE DATABASE database_name WITH opt_database1 opt_database2 } n->dbname = $3; n->dbpath = $5; -#ifdef MB +#ifdef MULTIBYTE if ($6 != NULL) { n->encoding = pg_char_to_encoding($6); if (n->encoding < 0) { @@ -2103,7 +2103,7 @@ CreatedbStmt: CREATE DATABASE database_name WITH opt_database1 opt_database2 CreatedbStmt *n = makeNode(CreatedbStmt); n->dbname = $3; n->dbpath = NULL; -#ifdef MB +#ifdef MULTIBYTE n->encoding = GetTemplateEncoding(); #endif $$ = (Node *)n; |