Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5979d73

Browse files
scrappyscrappy
committed
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).
1 parent 74b30a3 commit 5979d73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+641
-254
lines changed

‎src/Makefile.global.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.44 1998/07/24 03:31:04 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.45 1998/07/26 04:30:15 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -151,7 +151,10 @@ X11_LIBS= -lX11 @X_EXTRA_LIBS@
151151
# enable multi-byte support
152152
# choose one of:
153153
# EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5
154-
MB=@MB@
154+
MULTIBYTE=@MULTIBYTE@
155+
ifdef MULTIBYTE
156+
MBFLAGS = -DMULTIBYTE=$(MULTIBYTE)
157+
endif
155158

156159
##############################################################################
157160
#

‎src/backend/access/common/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.11 1998/06/16 07:29:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.12 1998/07/26 04:30:16 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,8 +13,8 @@ include ../../../Makefile.global
1313

1414
CFLAGS+=-I../..
1515

16-
ifdef MB
17-
CFLAGS+= -DMB=$(MB)
16+
ifdef MULTIBYTE
17+
CFLAGS+= $(MBFLAGS)
1818
endif
1919

2020
OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \

‎src/backend/access/common/printtup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.30 1998/07/18 18:34:01 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.31 1998/07/26 04:30:16 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,7 +24,7 @@
2424
#include <utils/syscache.h>
2525

2626
#ifdef MULTIBYTE
27-
#include <commands/variable.h>
27+
#include <mb/pg_wchar.h>
2828
#endif
2929

3030
/* ----------------------------------------------------------------

‎src/backend/bootstrap/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.14 1998/07/24 03:31:06 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.15 1998/07/26 04:30:17 scrappy Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -22,8 +22,8 @@ SRCDIR= ../..
2222
include ../../Makefile.global
2323

2424
CFLAGS += -I..
25-
ifdef MB
26-
CFLAGS += -DMB=$(MB)
25+
ifdef MULTIBYTE
26+
CFLAGS+= $(MBFLAGS)
2727
endif
2828

2929
ifeq ($(CC), gcc)

‎src/backend/bootstrap/bootparse.y

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.17 1998/07/24 03:31:07 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.18 1998/07/26 04:30:18 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -31,7 +31,7 @@
3131
#include "bootstrap/bootstrap.h"
3232
#include "catalog/heap.h"
3333
#include "catalog/pg_am.h"
34-
#ifdef MB
34+
#ifdef MULTIBYTE
3535
#include "catalog/pg_attribute_mb.h"
3636
#include "catalog/pg_class_mb.h"
3737
#else

‎src/backend/bootstrap/bootscanner.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.9 1998/07/24 03:31:08 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.10 1998/07/26 04:30:19 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -20,7 +20,7 @@
2020
#include "storage/block.h"
2121
#include "storage/off.h"
2222
#include "storage/itemptr.h"
23-
#ifdef MB
23+
#ifdef MULTIBYTE
2424
#include "catalog/pg_attribute_mb.h"
2525
#else
2626
#include "catalog/pg_attribute.h"
@@ -32,7 +32,7 @@
3232
#include "access/funcindex.h"
3333
#include "storage/fd.h"
3434
#include "catalog/pg_am.h"
35-
#ifdef MB
35+
#ifdef MULTIBYTE
3636
#include "catalog/pg_class_mb.h"
3737
#else
3838
#include "catalog/pg_class.h"

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.45 1998/07/24 03:31:08 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.46 1998/07/26 04:30:19 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -41,7 +41,7 @@
4141
#include "catalog/catname.h"
4242
#include "catalog/index.h"
4343
#include "catalog/pg_am.h"
44-
#ifdef MB
44+
#ifdef MULTIBYTE
4545
#include "catalog/pg_attribute_mb.h"
4646
#include "catalog/pg_class_mb.h"
4747
#else

‎src/backend/catalog/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.11 1998/07/24 03:31:09 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.12 1998/07/26 04:30:20 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -24,7 +24,7 @@ SUBSYS.o: $(OBJS)
2424

2525
GENBKI= ./genbki.sh
2626

27-
ifdef MB
27+
ifdef MULTIBYTE
2828
GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
2929
pg_database_mb.h pg_variable.h pg_shadow.h \
3030
pg_group.h pg_log.h \
@@ -36,7 +36,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
3636
)
3737
endif
3838

39-
ifdef MB
39+
ifdef MULTIBYTE
4040
LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
4141
pg_proc.h pg_type.h pg_attribute_mb.h pg_class_mb.h \
4242
pg_inherits.h pg_index.h pg_version.h pg_statistic.h \

‎src/backend/commands/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.14 1998/07/24 03:31:11 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.15 1998/07/26 04:30:22 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,8 +13,8 @@ include ../../Makefile.global
1313

1414
CFLAGS += -I..
1515

16-
ifdef MB
17-
CFLAGS += -DMB=$(MB)
16+
ifdef MULTIBYTE
17+
CFLAGS+= $(MBFLAGS)
1818
endif
1919

2020
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \

‎src/backend/commands/cluster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.24 1998/07/24 03:31:13 scrappy Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.25 1998/07/26 04:30:22 scrappy Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -43,7 +43,7 @@
4343
#include <utils/excid.h>
4444
#include <utils/mcxt.h>
4545
#include <catalog/pg_proc.h>
46-
#ifdef MB
46+
#ifdef MULTIBYTE
4747
#include <catalog/pg_class_mb.h>
4848
#else
4949
#include <catalog/pg_class.h>

‎src/backend/commands/copy.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.50 1998/07/24 03:31:14 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.51 1998/07/26 04:30:23 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -37,7 +37,7 @@
3737
#include "commands/trigger.h"
3838
#include <storage/fd.h>
3939

40-
#ifdef MB
40+
#ifdef MULTIBYTE
4141
#include "mb/pg_wchar.h"
4242
#endif
4343

@@ -1016,14 +1016,14 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
10161016
char c;
10171017
int done = 0;
10181018
int i = 0;
1019-
#ifdef MB
1019+
#ifdef MULTIBYTE
10201020
int mblen;
10211021
int encoding;
10221022
unsigned char s[2];
10231023
int j;
10241024
#endif
10251025

1026-
#ifdef MB
1026+
#ifdef MULTIBYTE
10271027
encoding = pg_get_client_encoding();
10281028
s[1] = 0;
10291029
#endif
@@ -1129,7 +1129,7 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
11291129
}
11301130
if (!done) {
11311131
attribute[i++] = c;
1132-
#ifdef MB
1132+
#ifdef MULTIBYTE
11331133
s[0] = c;
11341134
mblen = pg_encoding_mblen(encoding, s);
11351135
mblen--;
@@ -1145,7 +1145,7 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
11451145
elog(ERROR, "CopyReadAttribute - attribute length too long. line: %d", lineno);
11461146
}
11471147
attribute[i] = '\0';
1148-
#ifdef MB
1148+
#ifdef MULTIBYTE
11491149
return(pg_client_to_server((unsigned char*)attribute, strlen(attribute)));
11501150
#else
11511151
return (&attribute[0]);
@@ -1157,20 +1157,20 @@ CopyAttributeOut(FILE *fp, unsigned char *server_string, char *delim, int is_arr
11571157
{
11581158
unsigned char *string;
11591159
unsigned char c;
1160-
#ifdef MB
1160+
#ifdef MULTIBYTE
11611161
int mblen;
11621162
int encoding;
11631163
int i;
11641164
#endif
11651165

1166-
#ifdef MB
1166+
#ifdef MULTIBYTE
11671167
string = pg_server_to_client(server_string, strlen(server_string));
11681168
encoding = pg_get_client_encoding();
11691169
#else
11701170
string = server_string;
11711171
#endif
11721172

1173-
#ifdef MB
1173+
#ifdef MULTIBYTE
11741174
for (; (mblen = pg_encoding_mblen(encoding, string)) &&
11751175
((c = *string) != '\0'); string += mblen)
11761176
#else
@@ -1197,7 +1197,7 @@ CopyAttributeOut(FILE *fp, unsigned char *server_string, char *delim, int is_arr
11971197
fputc('\\', fp);
11981198
}
11991199
}
1200-
#ifdef MB
1200+
#ifdef MULTIBYTE
12011201
for (i=0;i<mblen;i++) {
12021202
fputc(*(string+i), fp);
12031203
}

‎src/backend/commands/dbcommands.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.16 1998/07/24 03:31:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.17 1998/07/26 04:30:24 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -22,7 +22,7 @@
2222
#include "access/htup.h"
2323
#include "access/relscan.h"
2424
#include "catalog/catname.h"
25-
#ifdef MB
25+
#ifdef MULTIBYTE
2626
#include "catalog/pg_database_mb.h"
2727
#else
2828
#include "catalog/pg_database.h"
@@ -47,7 +47,7 @@ static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel);
4747
static void stop_vacuum(char *dbpath, char *dbname);
4848

4949
void
50-
#ifdef MB
50+
#ifdef MULTIBYTE
5151
createdb(char *dbname, char *dbpath, int encoding)
5252
#else
5353
createdb(char *dbname, char *dbpath)
@@ -98,7 +98,7 @@ createdb(char *dbname, char *dbpath)
9898
dbname, user_id, dbname);
9999
#endif
100100

101-
#ifdef MB
101+
#ifdef MULTIBYTE
102102
sprintf(buf, "insert into pg_database (datname, datdba, encoding, datpath)"
103103
" values (\'%s\', \'%d\', \'%d\', \'%s\');", dbname, user_id, encoding, loc);
104104
#else

‎src/backend/commands/rename.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.12 1998/07/24 03:31:19 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.13 1998/07/26 04:30:24 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -30,7 +30,7 @@
3030
#include <utils/excid.h>
3131
#include <utils/mcxt.h>
3232
#include <catalog/pg_proc.h>
33-
#ifdef MB
33+
#ifdef MULTIBYTE
3434
#include <catalog/pg_class_mb.h>
3535
#else
3636
#include <catalog/pg_class.h>

‎src/backend/commands/user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <miscadmin.h>
2222
#include <catalog/catname.h>
23-
#ifdef MB
23+
#ifdef MULTIBYTE
2424
#include <catalog/pg_database_mb.h>
2525
#else
2626
#include <catalog/pg_database.h>

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.67 1998/07/24 03:31:20 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.68 1998/07/26 04:30:25 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,7 +27,7 @@
2727
#include "catalog/catalog.h"
2828
#include "catalog/catname.h"
2929
#include "catalog/index.h"
30-
#ifdef MB
30+
#ifdef MULTIBYTE
3131
#include "catalog/pg_class_mb.h"
3232
#else
3333
#include "catalog/pg_class.h"

0 commit comments

Comments
 (0)