Index: src/backend/utils/mb/encnames.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/mb/encnames.c,v
retrieving revision 1.26
diff -c -c -u -r1.26 encnames.c
--- src/backend/utils/mb/encnames.c	15 Oct 2005 02:49:33 -0000	1.26
+++ src/backend/utils/mb/encnames.c	22 Dec 2005 02:45:02 -0000
@@ -264,6 +264,7 @@
 /* ----------
  * These are "official" encoding names.
  * XXX must be sorted by the same order as pg_enc type (see mb/pg_wchar.h)
+ * and pg_conv_map in mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c.
  * ----------
  */
 pg_enc2name pg_enc2name_tbl[] =
Index: src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v
retrieving revision 1.16
diff -c -c -u -r1.16 utf8_and_iso8859.c
--- src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c	22 Nov 2005 18:17:26 -0000	1.16
+++ src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c	22 Dec 2005 02:45:03 -0000
@@ -106,10 +106,11 @@
 	sizeof(ULmapISO8859_16) / sizeof(pg_utf_to_local)}, /* ISO-8859-16 Latin 10 */
 	{PG_WIN1256},				/* windows-1256 */
 	{PG_WIN1258},				/* Windows-1258 */
+	{PG_WIN866},				/* (MS-DOS CP866) */
 	{PG_WIN874},				/* windows-874 */
 	{PG_KOI8R},					/* KOI8-R */
 	{PG_WIN1251},				/* windows-1251 */
-	{PG_WIN866},				/* (MS-DOS CP866) */
+	{PG_WIN1252},				/* windows-1252 */
 	{PG_ISO_8859_5, LUmapISO8859_5, ULmapISO8859_5,
 		sizeof(LUmapISO8859_5) / sizeof(pg_local_to_utf),
 	sizeof(ULmapISO8859_5) / sizeof(pg_utf_to_local)},	/* ISO-8859-5 */
@@ -122,6 +123,12 @@
 	{PG_ISO_8859_8, LUmapISO8859_8, ULmapISO8859_8,
 		sizeof(LUmapISO8859_8) / sizeof(pg_local_to_utf),
 	sizeof(ULmapISO8859_8) / sizeof(pg_utf_to_local)},	/* ISO-8859-8 */
+	{PG_WIN1250},			/* windows-1250 */
+	{PG_SJIS},				/* SJIS */
+	{PG_BIG5},				/* BIG5 */
+	{PG_GBK},				/* GBK */
+	{PG_UHC},				/* UHC */
+	{PG_GB18030}			/* GB18030 */
 };
 
 Datum