summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuo Ishii2013-12-15 01:33:06 +0000
committerTatsuo Ishii2013-12-15 02:09:05 +0000
commit1f0626ee40f2decd93ca96c6f9e9a9b5edff57ba (patch)
treef3e4ffed7ad2bcf4d4f7458731b8dfbccf5a03b0
parent1b4f7f93b4693858cb983af3cd557f6097dab67b (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.
-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 8b8862ffb2..3c9d7abcbd 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"},