Included are patches for doc/README.mb and README.mb.jp.

Please apply to both trees.
--
Tatsuo Ishii

3 files changed, 163 insertions, 73 deletions

diff --git a/doc/README.mb b/doc/README.mb
index d5436d16039..4d6c3288af1 100644
--- a/doc/README.mb
+++ b/doc/README.mb
@@ -1,4 +1,4 @@
-postgresql 6.4 multi-byte (MB) support README	  Jul 22 1998
+postgresql 6.4 multi-byte (MB) support README	  Dec 16 1998
 
 						Tatsuo Ishii
 						[email protected]
@@ -11,7 +11,7 @@ multi-byte character sets such as EUC(Extended Unix Code), Unicode and
 Mule internal code. With the MB enabled you can use multi-byte
 character sets in regexp ,LIKE and some functions. The encoding system
 chosen is determined when initializing your PostgreSQL installation
-using initdb(1). Note that this can be overrided when creating a
+using initdb(1). Note that this can be overridden when creating a
 database using createdb(1) or create database SQL command. So you
 could have multiple databases with different encoding system.
 
@@ -23,16 +23,13 @@ me know if you find any problem while using 8-bit characters)
 
 1. How to use
 
-create src/Makefile.custom with a line including:
-
-	MB=encoding_system
-
-or run configure with the mb option:
+run configure with the mb option:
 
 	% configure --with-mb=encoding_system
 
 where encoding_system is one of:
 
+	SQL_ASCII		ASCII
 	EUC_JP			Japanese EUC
 	EUC_CN			Chinese EUC
 	EUC_KR			Korean EUC
@@ -47,11 +44,6 @@ where encoding_system is one of:
 
 Example:
 
-	% cat Makefile.custom
-	MB=EUC_JP
-
-	or
-
 	% configure --with-mb=EUC_JP
 
 If MB is disabled, nothing is changed except better supporting for
@@ -78,6 +70,31 @@ another way to accomplish this is to use a SQL command:
 
 	CREATE DATABASE korean WITH ENCODING = 'EUC_KR';
 
+The encoding for a database is represented as "encoding" column in the
+pg_database system catalog.
+
+	datname      |datdba|encoding|datpath      
+	-------------+------+--------+-------------
+	template1    |  1739|       1|template1    
+	postgres     |  1739|       0|postgres     
+	euc_jp       |  1739|       1|euc_jp       
+	euc_kr       |  1739|       3|euc_kr       
+	euc_cn       |  1739|       2|euc_cn       
+	unicode      |  1739|       5|unicode      
+	mule_internal|  1739|       6|mule_internal
+
+A number in the encoding column is "encoding id" and can be translated
+to the encoding name using pg_encoding command.
+
+	$ pg_encoding 1
+	EUC_JP
+
+If an argument to pg_encoding is not a number, then it is regarded as
+an encoding name and pg_encoding will return the encoding id.
+
+	$ pg_encoding EUC_JP
+	1
+
 3. PGCLIENTENCODING
 
 If an environment variable PGCLIENTENCODING is defined on the
@@ -90,6 +107,7 @@ backend would be translated to SJIS of course.
 
 Supported encodings for PGCLIENTENCODING are:
 
+	SQL_ASCII		ASCII
 	EUC_JP			Japanese EUC
 	SJIS			Yet another Japanese encoding
 	EUC_CN			Chinese EUC
@@ -151,6 +169,13 @@ Unicode: http://www.unicode.org/
 
 5. History
 
+Dec 15, 1998
+	* Bugs related to SQL_ASCII support fixed
+
+Nov 5, 1998
+	* 6.4 release. In this version, pg_database has "encoding"
+	  column that represents the database encoding
+
 Jul 22, 1998
 	* determine encoding at initdb/createdb rather than compile time
 	* support for PGCLIENTENCODING when issuing COPY command
diff --git a/doc/README.mb.jp b/doc/README.mb.jp
index 08476595dc0..52ae09ec48a 100644
--- a/doc/README.mb.jp
+++ b/doc/README.mb.jp
@@ -1,4 +1,4 @@
-postgresql 6.4 multi-byte (MB) support README	       1998/7/22 $B:n@.(B
+postgresql 6.4 multi-byte (MB) support README	       1998/12/16 $B:n@.(B
 
 							$B@P0fC#IW(B
 						[email protected]
@@ -19,7 +19,7 @@ postgresql 6.4 multi-byte (MB) support README	       1998/7/22 $B:n@.(B
     6.$B%^%k%A%P%$%HJ8;z$N(B LIKE $B8!:w$,;HMQ2DG=(B
     7.character_length(), position(), substring() $B$G$N%^%k%A%P%$%H(B
       $B%5%]!<%H(B
-    8.$B4D6-JQ?t(B PGCLIENTENCODING $B$K$h$j!"%/%i%$%"%s%HB&$NJ8;z%3!<%I(B
+    8.$B4D6-JQ?t(B PGCLIENTENCODING $B$K$h$j!"%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0(B
       $B$,%P%C%/%(%s%IB&$H0[$k>l9g$K!"<+F0E*$K%3!<%IJQ49$r9T$J$$$^$9!#(B
 
 $B%$%s%9%H!<%k!'(B
@@ -27,20 +27,17 @@ postgresql 6.4 multi-byte (MB) support README	       1998/7/22 $B:n@.(B
   $B%G%U%)%k%H$G$O(B PostgreSQL $B$O%^%k%A%P%$%H$r%5%]!<%H$7$F$$$^$;$s!#(B
   $B%^%k%A%P%$%H%5%]!<%H$rM-8z$K$9$kJ}K!$r@bL@$7$^$9!#(B
 
-  src/Makefile.custom $B$H$$$&%U%!%$%k$r:n$j!"(B
-	
-	MB=EUC_JP
-
-  $B$N(B 1 $B9T$rDI2C$7$^$9!#$"$k$$$O!"(Bconfigure $B5/F0;~$K0J2<$N$h$&$K;XDj$7$^$9!#(B
+  configure $B5/F0;~$K0J2<$N$h$&$K;XDj$7$^$9!#(B
 
   % configure --with-mb=EUC_JP
 
-  $BJ8;z%3!<%I$H$7$F$O(B EUC_JP $B$r4^$a!"0J2<$N%3!<%I$,(B initdb $B$K$h$k(B
+  $B%(%s%3!<%G%#%s%0$H$7$F$O(B EUC_JP $B$r4^$a!"0J2<$N%3!<%I$,(B initdb $B$K$h$k(B
   $B%G!<%?%Y!<%9=i4|2=;~$*$h$S%G!<%?%Y!<%9:n@.;~(B
   (Unix $B%3%^%s%I$N(B createdb $B$b$7$/$O(B SQL $B$N(B create database)
-  $B$K;XDj$G$-$^$9!#(BMakefile.custom $B$"$k$$$O(B configure $B$G;XDj$7$?J8;z%3!<(B
-  $B%I$O(B initdb $B$N>JN,;~$NJ8;z%3!<%I$K$J$j$^$9!#(B
+  $B$K;XDj$G$-$^$9!#(Bconfigure $B$G;XDj$7$?%(%s%3!<%G%#%s%0$O(B initdb $B$N>JN,;~$N(B
+  $B%(%s%3!<%G%#%s%0$K$J$j$^$9!#(B
 
+	SQL_ASCII	ASCII
 	EUC_JP		$BF|K\8l(B EUC
 	EUC_CN		GB $B$r%Y!<%9$K$7$?CfJ8(BEUC$B!#(Bcode set 2 $B$O(B
 			SS2+2$B%P%$%H%3!<%I(B = 3$B%P%$%HI=8=$G$9!#(B
@@ -72,42 +69,68 @@ postgresql 6.4 multi-byte (MB) support README	       1998/7/22 $B:n@.(B
   http://www.sra.co.jp/people/t-ishii/PostgreSQL/ $B$G$b4JC1$J%$%s%9%H!<(B
   $B%kJ}K!$r>R2p$7$F$$$^$9!#(B
 
-initdb/createdb/create database $B$K$*$1$kJ8;z%3!<%I$N;XDj$K$D$$$F(B
+initdb/createdb/create database $B$K$*$1$k%(%s%3!<%G%#%s%0$N;XDj$K$D$$$F(B
 
-  initdb $B$G$O0J2<$N%*%W%7%g%s$GJ8;z%3!<%I$,;XDj$G$-$^$9!#(B
+  initdb $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!#(B
 
-	-e $BJ8;z%3!<%I(B
-	-pgencoding $BJ8;z%3!<%I(B
+	-e $B%(%s%3!<%G%#%s%0(B
+	-pgencoding $B%(%s%3!<%G%#%s%0(B
 
-  $B$3$3$G;XDj$7$?J8;z%3!<%I$O!"0J8e(B createdb/create database $B$GJ8;z%3!<%I$r(B
-  $B>JN,$7$?>l9g$K@_Dj$5$l$kJ8;z%3!<%I$K$J$j$^$9!#(B-e $B$^$?$O(B -pgencoding
-  $B%*%W%7%g%s$r>JN,$7$?>l9g$O!"(BMakefile.custom $B$"$k$$$O(B configure $B$G;X(B
-  $BDj$7$?J8;z%3!<%I$,:NMQ$5$l$^$9!#(B
+  $B$3$3$G;XDj$7$?%(%s%3!<%G%#%s%0$O!"0J8e(B createdb/create database $B$G%((B
+  $B%s%3!<%G%#%s%0$r>JN,$7$?>l9g$K@_Dj$5$l$k%(%s%3!<%G%#%s%0$K$J$j$^$9!#(B
+  -e $B$^$?$O(B -pgencoding $B%*%W%7%g%s$r>JN,$7$?>l9g$O!"(Bconfigure $B$G;XDj$7(B
+  $B$?%(%s%3!<%G%#%s%0$,:NMQ$5$l$^$9!#(B
 
-  createdb $B$G$O0J2<$N%*%W%7%g%s$GJ8;z%3!<%I$,;XDj$G$-$^$9!#(B
+  createdb $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!#(B
 
-	-E $BJ8;z%3!<%I(B
+	-E $B%(%s%3!<%G%#%s%0(B
 
-  create database $B$G$O0J2<$N%*%W%7%g%s$GJ8;z%3!<%I$,;XDj$G$-$^$9!#(B
+  create database $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!#(B
 
-	CREATE DATABASE dbanme WITH ENCODING = '$BJ8;z%3!<%I(B';
+	CREATE DATABASE dbanme WITH ENCODING = '$B%(%s%3!<%G%#%s%0(B';
 
   LOCATION $B$rF1;~$K;XDj$9$k>l9g$O0J2<$N$h$&$K$J$j$^$9!#(B
 
-	CREATE DATABASE dbanme WITH LOCATION = 'path' ENCODING = '$BJ8;z%3!<%I(B';
+	CREATE DATABASE dbanme WITH LOCATION = 'path' ENCODING = '$B%(%s%3!<%G%#%s%0(B';
+
+  createdb/create database $B$O!"%(%s%3!<%G%#%s%0;XDj$r>JN,$7$?>l9g$O!"(Binitdb 
+  $B$G;XDj$7$?%(%s%3!<%G%#%s%0$,:NMQ$5$l$^$9!#(B
+
+  $B%G!<%?%Y!<%9$N%(%s%3!<%G%#%s%0$O!"(Bpsql $B$N(B \l $B$d!"(BSQL $BJ8$N(B
+  select * from pg_database $B$G;2>H$G$-$^$9!#(B
+
+	datname      |datdba|encoding|datpath      
+	-------------+------+--------+-------------
+	template1    |  1739|       1|template1    
+	postgres     |  1739|       0|postgres     
+	euc_jp       |  1739|       1|euc_jp       
+	euc_kr       |  1739|       3|euc_kr       
+	euc_cn       |  1739|       2|euc_cn       
+	unicode      |  1739|       5|unicode      
+	mule_internal|  1739|       6|mule_internal
+
+  encoding $B%+%i%`$N?tCM$,$=$N%G!<%?%Y!<%9$N%(%s%3!<%G%#%s%0$rI=$7$^$9(B
+  ($B%(%s%3!<%G%#%s%0(BID)$B!#%(%s%3!<%G%#%s%0(B ID $B$r%(%s%3!<%G%#%s%0L>$KJQ49(B
+  $B$9$k$K$O!"(Bpg_encoding $B%3%^%s%I$r;HMQ$7$^$9!#$?$H$($P!"(B
+
+	$ pg_encoding 1
+	EUC_JP
 
-  createdb/create database $B$O!"J8;z%3!<%I;XDj$r>JN,$7$?>l9g$O!"(Binitdb 
-  $B$G;XDj$7$?J8;z%3!<%I$,:NMQ$5$l$^$9!#(B
+   $B$N$h$&$K$J$j$^$9!#$J$*!"(Bpg_encoding $B$O?t;z0J30$,M?$($i$l$k$H%(%s%3!<(B
+   $B%G%#%s%0L>$H8+Jo$7$F%(%s%3!<%G%#%s%0(BID$B$rJV$7$^$9!#(B
+
+	$ pg_encoding EUC_JP
+	1
 
 $B4D6-JQ?t(B PGCLIENTENCODING $B$K$D$$$F!'(B
 
   $B4D6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$$J$$>l9g!"(Blibpq $B$O%;%C%7%g%s(B
-  $B3+;O;~$K%5!<%PB&$KJ8;z%3!<%I$rLd$$9g$o$;!"$=$NCM$r4D6-JQ?t(B 
+  $B3+;O;~$K%P%C%/%(%s%IB&$K%(%s%3!<%G%#%s%0$rLd$$9g$o$;!"$=$NCM$r4D6-JQ?t(B 
   PGCLIENTENCODING $B$K@_Dj$7$^$9!#(B
 
-  $B4D6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$$k>l9g$O$=$NCM$,M%@h$5$l!"%5!<(B
-  $B%PB&$H0[$J$kJ8;z%3!<%I$,;HMQ$G$-$^$9!#@_Dj2DG=$JJ8;z%3!<%I$O!">e5-$K(B
-  $B2C$(!"(BSJIS ($B%7%U%H(BJIS)$B$,;XDj$G$-$^$9!#(B
+  $B4D6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$$k>l9g$O$=$NCM$,M%@h$5$l!"%P%C(B
+  $B%/%(%s%IB&$H0[$J$k%(%s%3!<%G%#%s%0$,;HMQ$G$-$^$9!#@_Dj2DG=$J%(%s%3!<(B
+  $B%G%#%s%0$O!">e5-$K2C$(!"(BSJIS ($B%7%U%H(BJIS)$B$,;XDj$G$-$^$9!#(B
 
 	$B$A$J$_$K!"(BSJIS $B$O(B JISX0201 $B$N(B 1$B%P%$%H%+%J!"$$$o$f$k!VH>3Q%+%?(B
 	$B%+%J!W$b%5%]!<%H$7$F$$$^$9(B($B7h$7$F!VH>3Q%+%?%+%J!W$N;HMQ$r$*4+(B
@@ -115,47 +138,48 @@ initdb/createdb/create database $B$K$*$1$kJ8;z%3!<%I$N;XDj$K$D$$$F(B
 
   $B$?$H$($P!"(BMB=EUC_JP $B$G(B PostgeSQL $B$,%$%s%9%H!<%k$5$l$F$$$k>l9g!"(B
   postmaster $B$rN)$A>e$2$k$H$-$K4D6-JQ?t(B PGCLIENTENCODING $B$K(B SJIS $B$r@_(B
-  $BDj$9$k$H!"%/%i%$%"%s%H$O(B SJIS $B%3!<%I$G(B PostgreSQL $B$K%"%/%;%9$G$-$k$h(B
+  $BDj$9$k$H!"%U%m%s%H%(%s%I$O(B SJIS $B%3!<%I$G(B PostgreSQL $B$K%"%/%;%9$G$-$k$h(B
   $B$&$K$J$j$^$9!#$?$@$7!"%G!<%?%Y!<%9$K3JG<$5$l$k%G!<%?<+BN$O$"$/$^$G(B 
   MB $B$G;XDj$7$?(B EUC_JP $B$N$^$^$G$9!#(B
 
-  $B%/%i%$%"%s%HB&$G%;%C%7%g%sKh$KJ8;z%3!<%I$rJQ$($k$3$H$b$G$-$^$9!#(B
-  $B%;%C%7%g%s3+;O;~$K4D6-JQ?t(B PGCLIENTENCODING $B$,%;%C%H$5$l$F$$$k$H!"$=(B
-  $B$l$,M%@h$5$l$F%/%i%$%"%s%HB&$NJ8;z%3!<%I$K:NMQ$5$l$^$9!#$3$N5!G=$rMx(B
+  $B%U%m%s%H%(%s%IB&$G%;%C%7%g%sKh$K%(%s%3!<%G%#%s%0$rJQ$($k$3$H$b$G$-$^(B
+  $B$9!#%;%C%7%g%s3+;O;~$K4D6-JQ?t(B PGCLIENTENCODING $B$,%;%C%H$5$l$F$$$k$H!"(B
+  $B$=$l$,%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$K:NMQ$5$l$^$9!#$3$N5!G=$rMx(B
   $BMQ$9$k$H!"$"$k%f!<%6$O(B EUC_JP $B$G!"JL$J%f!<%6$O(B SJIS $B$GF1$8%G!<%?%Y!<(B
   $B%9$K%"%/%;%9$9$k$H$$$&$h$&$J$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
   MB=MULE_INTERNAL $B$G(B PostgreSQL $B$r%$%s%9%H!<%k$7$F$*$/$H!"IaCJ$O(B 
-  EUC_JP $B$G%/%i%$%"%s%H$rMxMQ$7!"J#?t$NJ8;z=89g$r:.:_$5$;$k$H$-$@$1%/(B
+  EUC_JP $B$G%U%m%s%H%(%s%I$rMxMQ$7!"J#?t$NJ8;z=89g$r:.:_$5$;$k$H$-$@$1%/(B
   $B%i%$%"%s%H$r(B MULE_INTERNAL $B$K@_Dj$9$k$J$I$N;H$$J,$1$,$G$-$FJXMx$G$9!#(B
   $B$?$@!"0lHL$K(B EUC_JP $B$KHf$Y!"(BMULE_INTERNAL $B$K$h$k%G!<%?I=8=$O$d$d%9%Z!<(B
   $B%9$r6t$&$N$G!"$=$N$X$s$O9MN8$7$F$*$/I,MW$,$"$j$^$9!#$?$H$($P!"(B2$B%P%$(B
   $B%H$GI=8=$G$-$k4A;z$O(B MULE_INTERNAL $B$G$O(B 3$B%P%$%H$rMW$7$^$9!#(B
 
-  $BCm0U$7$F$*$/I,MW$,$"$k$N$O!"%5!<%PB&$NJ8;z%3!<%I$H%/%i%$%"%s%HB&$NJ8(B
-  $B;z%3!<%I$,$$$D$bAj8_JQ49$G$-$k$H$O8B$i$J$$$3$H$G$9!#6KC<$JOC!"%5!<%P(B
-  $BB&$,(B EUC_JP $B$J$N$K!"%/%i%$%"%s%HB&$,(B EUC_KR $B$@$C$?$i$I$&$J$k$G$7$g$&!#(B
+  $BCm0U$7$F$*$/I,MW$,$"$k$N$O!"%P%C%/%(%s%IB&$N%(%s%3!<%G%#%s%0$H%U%m%s(B
+  $B%H%(%s%IB&$N%(%s%3!<%G%#%s%0$,$$$D$bAj8_JQ49$G$-$k$H$O8B$i$J$$$3$H$G(B
+  $B$9!#6KC<$JOC!"%P%C%/%(%s%IB&$,(B EUC_JP $B$J$N$K!"%U%m%s%H%(%s%IB&$,(B
+  EUC_KR $B$@$C$?$i$I$&$J$k$G$7$g$&!#(B
   $B$3$N>l9g(B PostgreSQL $B$OJQ49$G$-$J$$%3!<%I$r(B 16$B?JI=8=$KJQ49$7$F$7$^$$(B
   $B$^$9!#$?$H$($P!"(B"(bdae)" $B$N$h$&$K!#$J$*!"$3$N(B 16$B?JI=8=$O(B mule
-  internalcode $B$N%3!<%I$G$"$k$3$H$KCm0U$7$F2<$5$$!#$3$l$O!"D>@\%/%i%$(B
-  $B%"%s%H(B <--> $B%5!<%P$NJ8;z%3!<%I$rJQ49$9$k$N$G$O$J$/!"0lEYFbItI=8=$G$"(B
-  $B$k(B mule internal code $B$r7PM3$7$F$$$k$?$a$G$9!#(B
+  internalcode $B$N%3!<%I$G$"$k$3$H$KCm0U$7$F2<$5$$!#$3$l$O!"D>@\%U%m%s(B
+  $B%H%(%s%I(B <--> $B%P%C%/%(%s%I$N%(%s%3!<%G%#%s%0$rJQ49$9$k$N$G$O$J$/!"0l(B
+  $BEYFbItI=8=$G$"$k(B mule internal code $B$r7PM3$7$F$$$k$?$a$G$9!#(B
 
-  $B%/%i%$%"%s%HB&$NJ8;z%3!<%I$N@_Dj$O!"(B"set client_encoding" $B%3%^%s%I$G(B
-  $B$b2DG=$G$9!#$?$H$($P!"(B
+  $B%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$N@_Dj$O!"(B"set client_encoding" $B%3(B
+  $B%^%s%I$G$b2DG=$G$9!#$?$H$($P!"(B
 
 	set client_encoding to 'sjis';
 
-  $B$GL@<(E*$K%/%i%$%"%s%HB&$NJ8;z%3!<%I$r(B SJIS $B$K@_Dj$G$-$^$9!#<B:]!"%/(B
-  $B%i%$%"%s%H$,%5!<%P$K@\B3$9$k:]$K$O(B libpq $B$NCf$G(B "set
+  $B$G%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$r(B SJIS $B$K@_Dj$G$-$^$9!#<B:]!"%/(B
+  $B%i%$%"%s%H$,%P%C%/%(%s%I$K@\B3$9$k:]$K$O(B libpq $B$NCf$G(B "set
   client_encoding" $B%3%^%s%I$rH/9T$7$F$$$^$9!#%;%C%7%g%sCf$K(B 
-  set client_encoding" $B%3%^%s%I$rH/9T$9$l$P!"F0E*$KJ8;z%3!<%I$N@ZBX$((B
-  $B$,$G$-$^$9$,!"$=$N:]$K$O4D6-JQ?t(B PGCLIENTENCODING $B$rF1;~$K%/%i%$%"%s(B
-  $B%H%"%W%j%1!<%7%g%s$NCf$G@_Dj$7D>$9I,MW$,$"$j$^$9!#(B(psql $B$K$O8=:_$3$N(B
-  $B5!G=$,$J$$$?$a!";v<B>eF0E*$K%/%i%$%"%s%HB&$NJ8;z%3!<%I$r@_Dj$9$k$3$H(B
-  $B$,$G$-$^$;$s!#(B)
+  set client_encoding" $B%3%^%s%I$rH/9T$9$l$P!"F0E*$K%(%s%3!<%G%#%s%0$N@ZBX$((B
+  $B$,$G$-$^$9$,!"$=$N:]$K$O4D6-JQ?t(B PGCLIENTENCODING $B$rF1;~$K%U%m%s%H%((B
+  $B%s%I%"%W%j%1!<%7%g%s$NCf$G@_Dj$7D>$9I,MW$,$"$j$^$9!#(B(psql $B$K$O8=:_$3(B
+  $B$N5!G=$,$J$$$?$a!";v<B>eF0E*$K%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$r@_(B
+  $BDj$9$k$3$H$,$G$-$^$;$s!#(B)
 
-  $B8=:_@_Dj$5$l$F$$$k%/%i%$%"%s%HB&$NJ8;z%3!<%I$O(B
+  $B8=:_@_Dj$5$l$F$$$k%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$O(B
 
 	show client_encoding;
 
@@ -163,14 +187,14 @@ initdb/createdb/create database $B$K$*$1$kJ8;z%3!<%I$N;XDj$K$D$$$F(B
 
 	reset client_encoding;
 
-  $B$O!"%G%U%)%k%H$N%/%i%$%"%s%HJ8;z%3!<%I@_Dj$KI|5"$5$;$^$9!#(Bpostmaster 
-  $B$rN)$A>e$2$k$H$-$K4D6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$$k$H$=$NJ8(B
-  $B;z%3!<%I$K!"$=$&$G$J$1$l$P%3%s%Q%$%k;~$K;XDj$7$?%5!<%PB&$NJ8;z%3!<%I(B
-  $B$HF1$8$K$J$j$^$9!#(B
+  $B$O!"%G%U%)%k%H$N%U%m%s%H%(%s%I%(%s%3!<%G%#%s%0@_Dj$KI|5"$5$;$^$9!#(B
+  postmaster$B$rN)$A>e$2$k$H$-$K4D6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$(B
+  $B$k$H$=$N%(%s%3!<%G%#%s%0$K!"$=$&$G$J$1$l$P%3%s%Q%$%k;~$K;XDj$7$?%P%C(B
+  $B%/%(%s%IB&$N%(%s%3!<%G%#%s%0$HF1$8$K$J$j$^$9!#(B
 
 $B@)8B;v9`!'(B
 
-  SJIS $B$r;HMQ$9$k>l9g!"(BPostgreSQL $B$N%/%i%$%"%s%H$G$^$H$b$KBP1~$7$F$$$k(B
+  SJIS $B$r;HMQ$9$k>l9g!"(BPostgreSQL $B$N%U%m%s%H%(%s%I$G$^$H$b$KBP1~$7$F$$$k(B
   $B$N$O(B psql $B$@$1$G$9!#(BTcl/Tk$B!"$=$N$[$+$OBP1~$7$F$^$;$s!#(B
 
 $B<U<-!'(B
@@ -182,10 +206,30 @@ initdb/createdb/create database $B$K$*$1$kJ8;z%3!<%I$N;XDj$K$D$$$F(B
 
 $B2~DjMzNr!'(B
 
+  1998/12/16 $BK\%I%-%e%a%s%H=$@5!#(B
+	* Makefile.custom $B$G(B MB=EUC_JP $B$J$I$H@_Dj$9$kJ}K!$O(B 6.4 $B0J9_(B
+	  $B%5%]!<%H$5$l$F$$$J$$$N$G:o=|$7$?!#(B
+	* $BJ8;z%3!<%I(B $B"*(B $B%(%s%3!<%G%#%s%0!"%/%i%$%"%s%H"*%U%m%s%H%(%s%I(B
+	  $B%5!<%P"*%P%C%/%(%s%I(B $B$K$=$l$>$l8l6g$r=$@5!#(B
+
+  1998/12/15 6.4 $B8~$1%P%0=$@5%Q%C%A%j%j!<%9!#(B
+	* SQL_ASCII $B%5%]!<%H$N%P%0=$@5(B
+
+  1998/11/21 6.4 $B8~$1%P%0=$@5%Q%C%A%j%j!<%9!#(B
+	* BINARY CURSOR $B$NLdBj$r=$@5(B
+	* pg_dumpall $B$N%P%0=$@5(B
+
+  1998/11/5 6.4 $B%j%j!<%9!#(B
+	* pg_database $B$N(B encoding $B%+%i%`$,(B MB $B$,M-8z$G$J$$$H$-$K$b(B
+	  $BDI2C$5$l$k$h$&$K$J$C$?!#$=$N$?$a!"(BMB $B$,M-8z$G$J$$$H$-$K$O!"(B
+	  ASCII $B$N%(%s%3!<%G%#%s%0$rI=$9(B SQL_ASCII $B$r?7$7$$%(%s%3!<%G%#%s%0(B
+	  $B$H$7$FDI2C$7$?!#$3$l$K$H$b$J$$!"%(%s%3!<%G%#%s%0L>$KBP1~$9$k(B
+	  $B%(%s%3!<%G%#%s%0(BID$B$,(B SQL_ASCII $B$r(B 0 $B$H$9$kHV9f$KJQ99$K$J$C$?!#(B
+
   1998/7/22 6.4 $B&A8~$1$K%Q%C%A$r%j%j!<%9!#(B
-	* initdb/createdb/create database $B$G%5!<%PB&$NJ8;z%3!<%I$r@_Dj(B
-          $B$G$-$k5!G=<BAu!#$3$N$?$a!"%7%9%F%`%+%?%m%0$N(B pg_database $B$K(B
-          $B?7$7$$%+%i%`(B encoding $B$rDI2C(B(MB$B$,M-8z$J;~$@$1(B)
+	* initdb/createdb/create database $B$G%P%C%/%(%s%IB&$N(B
+	  $B%(%s%3!<%G%#%s%0$r@_Dj$-$k5!G=<BAu!#$3$N$?$a!"%7%9%F%`%+%?%m(B
+	  $B%0$N(B pg_database $B$K?7$7$$%+%i%`(B encoding $B$rDI2C(B(MB$B$,M-8z$J;~$@$1(B)
 	* copy $B$,(B PGCLIENTENCODING $B$KBP1~(B
 	* SQL92 $B$N(B "SET NAMES" $B$r%5%]!<%H(B(MB$B$,M-8z$J;~$@$1(B)
 	* LATIN2-5 $B$r%5%]!<%H(B
@@ -199,9 +243,9 @@ initdb/createdb/create database $B$K$*$1$kJ8;z%3!<%I$N;XDj$K$D$$$F(B
 
   1998/5/18 $B5!G=DI2C!?%P%0=$@5(B(mb_b2.patch $B$H$7$F(B pgsql-jp ML $B$K%j%j!<%9!"(B
 	$BK\2H$G$O(B 6.4 snapshot $B$K<h$j9~$^$l$kM=Dj(B)
-	* $B4D6-JQ?t(B PGCLIENTENCODING $B$N%5%]!<%H!#%/%i%$%"%s%HB&$N(B
-	  $BJ8;z%3!<%I$r;XDj$9$k!#8=:_!"(BSJIS, EUC_*, MULE_INTERNAL, LATIN1
-	  $B$,;XDj$G$-$k!#$^$?!"(B
+	* $B4D6-JQ?t(B PGCLIENTENCODING $B$N%5%]!<%H!#%U%m%s%H%(%s%IB&$N(B
+	  $B%(%s%3!<%G%#%s%0$r;XDj$9$k!#8=:_!"(BSJIS, EUC_*, MULE_INTERNAL, 
+	  LATIN1 $B$,;XDj$G$-$k!#$^$?!"(B
 	  set client_encoding to 'sjis';
 	  $B$G$b2DG=(B
 	* 8bit $BJ8;z$,EO$k$HLdBj$,5/$-$k2U=j$K$G$-$k$@$1BP1~(B
diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile
new file mode 100644
index 00000000000..a06f683afd8
--- /dev/null
+++ b/src/bin/pgaccess/Makefile
@@ -0,0 +1,21 @@
+#-------------------------------------------------------------------------
+#
+# Makefile
+#    Makefile for pgaccess
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.1.2.1 1998/12/18 18:01:36 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR= ../..
+include $(SRCDIR)/Makefile.global
+
+.PHONY: all clean
+all clean: 
+
+.PHONY: install
+install: pgaccess.tcl
+	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess.tcl $(BINDIR)/pgaccess