aboutsummaryrefslogtreecommitdiff
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:49 +0900
commit0c07ef1ad2ba73a6a050f3e1a19267f961a43586 (patch)
tree821dd24535686bbd4fa5707a29e1530941c3d2cd /src
parent5d545b7ed53a8b2058c1152bd1c9ae227b3280e3 (diff)
downloadpostgresql-0c07ef1ad2ba73a6a050f3e1a19267f961a43586.tar.gz
postgresql-0c07ef1ad2ba73a6a050f3e1a19267f961a43586.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.
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 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"},