From 0c07ef1ad2ba73a6a050f3e1a19267f961a43586 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Sun, 15 Dec 2013 10:33:06 +0900 Subject: [PATCH] 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. --- src/port/chklocale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/port/chklocale.c b/src/port/chklocale.c index d14ecb71820..75b186fdc2a 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"},