diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-03-04 15:13:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-03-04 15:13:46 +0400 |
| commit | d6edcf75a57d917c8d884db6530f7a58087fd54b (patch) | |
| tree | 210f7653102d91941cc854d4fb7a0e7a13b47b41 /sql-common | |
| parent | 922cdddeb0d4b536c81c0b4995ee965ae36b5e15 (diff) | |
| download | mariadb-git-d6edcf75a57d917c8d884db6530f7a58087fd54b.tar.gz | |
Bug#51166 mysql client defaults to charset 'ascii'
Using latin1 client character set for ASCII locales:
- because ascii is not a build-in character set
- for better backward compatibility
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 1f9c00f93be..88da0242f5b 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1961,7 +1961,7 @@ const MY_CSET_OS_NAME charsets[]= {"cp10029", "macce", my_cs_exact}, {"cp12001", "utf32", my_cs_unsupp}, {"cp20107", "swe7", my_cs_exact}, - {"cp20127", "ascii", my_cs_exact}, + {"cp20127", "latin1", my_cs_approx}, {"cp20866", "koi8r", my_cs_exact}, {"cp20932", "ujis", my_cs_exact}, {"cp20936", "gb2312", my_cs_approx}, @@ -1989,11 +1989,11 @@ const MY_CSET_OS_NAME charsets[]= #else /* not Windows */ {"646", "latin1", my_cs_approx}, /* Default on Solaris */ - {"ANSI_X3.4-1968", "ascii", my_cs_exact}, + {"ANSI_X3.4-1968", "latin1", my_cs_approx}, {"ansi1251", "cp1251", my_cs_exact}, {"armscii8", "armscii8", my_cs_exact}, {"armscii-8", "armscii8", my_cs_exact}, - {"ASCII", "ascii", my_cs_exact}, + {"ASCII", "latin1", my_cs_approx}, {"Big5", "big5", my_cs_exact}, {"cp1251", "cp1251", my_cs_exact}, {"cp1255", "hebrew", my_cs_approx}, @@ -2066,7 +2066,7 @@ const MY_CSET_OS_NAME charsets[]= {"ujis", "ujis", my_cs_exact}, - {"US-ASCII", "ascii", my_cs_exact}, + {"US-ASCII", "latin1", my_cs_approx}, {"utf8", "utf8", my_cs_exact}, {"utf-8", "utf8", my_cs_exact}, |