summaryrefslogtreecommitdiff
path: root/src
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:56 +0900
commit035226c61b9ac6882f7a7f0c0e51fd590c60d229 (patch)
treeea70580b20943515b96df4d5f582bc1b3b11c706 /src
parent7e694214e3396843c33224e1153b9168540afb05 (diff)
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.
Diffstat (limited to 'src')
-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 e4f3dc99e0e..004c91bd04a 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"},