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:10:41 +0900
commit8122e6f85a77872f9c67ed384398244e95c1e8e9 (patch)
tree429975f10d8f7d0795f4ff8b4e6d083f90107e80
parent324577f39bc8738ed0ec24c36c5cb2c2f81ec660 (diff)
downloadpostgresql-8122e6f85a77872f9c67ed384398244e95c1e8e9.tar.gz
postgresql-8122e6f85a77872f9c67ed384398244e95c1e8e9.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 9e889383f26..36296a18bc1 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"},