diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-01 12:22:31 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-01 12:22:31 +0500 |
| commit | 78c65d561cc3f215e237a04484ece0a5229fb410 (patch) | |
| tree | 642300435d0a35ec64a4b8539a6cedef116576c1 /strings | |
| parent | f02800bd9733efbdc1328f866ad0ef2779939f7c (diff) | |
| download | mariadb-git-78c65d561cc3f215e237a04484ece0a5229fb410.tar.gz | |
After-fix for back-port of WL#3759.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-sjis.c | 4 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index ac426e0d7b5..60280efe087 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4672,7 +4672,7 @@ static MY_CHARSET_HANDLER my_charset_handler= CHARSET_INFO my_charset_sjis_japanese_ci= { 13,0,0, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_NONASCII, /* state */ "sjis", /* cs name */ "sjis_japanese_ci", /* name */ "", /* comment */ @@ -4704,7 +4704,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci= CHARSET_INFO my_charset_sjis_bin= { 88,0,0, /* number */ - MY_CS_COMPILED|MY_CS_BINSORT, /* state */ + MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NONASCII, /* state */ "sjis", /* cs name */ "sjis_bin", /* name */ "", /* comment */ diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index ae942b59caa..91f633e45ce 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4200,7 +4200,7 @@ static MY_CHARSET_HANDLER my_charset_filename_handler= CHARSET_INFO my_charset_filename= { 17,0,0, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_HIDDEN, + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_HIDDEN|MY_CS_NONASCII, "filename", /* cs name */ "filename", /* name */ "", /* comment */ |