aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2013-12-15 10:33:06 +0900
committerTatsuo Ishii <ishii@postgresql.org>2013-12-15 11:11:11 +0900
commit69f77d75658821ddd6ecf102a7ab4b27eb316d80 (patch)
tree3e4866132010c58cd4e269418b60dc0825a289a3
parent45d0c1b7d8a5657d6e333327eff7e1c51f6071bd (diff)
downloadpostgresql-69f77d75658821ddd6ecf102a7ab4b27eb316d80.tar.gz
postgresql-69f77d75658821ddd6ecf102a7ab4b27eb316d80.zip
Add "SHIFT_JIS" as an accepted encoding name for locale checking.
When locale is "ja_JP.SJIS", nl_langinfo(CODESET) returns "SHIFT_JIS" on some platforms, at least on RedHat Linux. So the encoding/locale match table (encoding_match_list) needs the entry. Otherwise client encoding is set to SQL_ASCII. Back patch to all supported branches.
-rw-r--r--src/port/chklocale.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 864071d05e6..58ed9e2813c 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -162,6 +162,7 @@ static const struct encoding_match encoding_match_list[] = {
{PG_SJIS, "SJIS"},
{PG_SJIS, "PCK"},
{PG_SJIS, "CP932"},
+ {PG_SJIS, "SHIFT_JIS"},
{PG_BIG5, "BIG5"},
{PG_BIG5, "BIG5HKSCS"},