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.

diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 8b8862ffb29a21936dd4fa9f1772485f649f3281..3c9d7abcbd7fd580b5efa33ab602a89521c327a5 100644 (file)
--- 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"},