mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
After-fix for back-port of WL#3759.
This commit is contained in:
parent
f02800bd97
commit
78c65d561c
2 changed files with 3 additions and 3 deletions
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue