summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-06-03 14:59:17 +0500
committerbar@bar.mysql.r18.ru <>2003-06-03 14:59:17 +0500
commit759214fa418c5570925ba1d5efd5a154e3b7c076 (patch)
treef7bb603f0c1323874da13a5e0f5bc44f6781cada /strings
parent7342852dd93d16385b69af08e30d6747a2f358e3 (diff)
downloadmariadb-git-759214fa418c5570925ba1d5efd5a154e3b7c076.tar.gz
MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-ucs2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 8cb8f84f281..5d78ab5dcff 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1042,7 +1042,7 @@ static MY_CHARSET_HANDLER my_charset_handler=
CHARSET_INFO my_charset_ucs2_general_ci=
{
35,0,0, /* number */
- MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONTEXT,
"ucs2", /* cs name */
"ucs2_general_ci", /* name */
"", /* comment */
@@ -1065,7 +1065,7 @@ CHARSET_INFO my_charset_ucs2_general_ci=
CHARSET_INFO my_charset_ucs2_bin=
{
90,0,0, /* number */
- MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE, /* state */
+ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONTEXT,
"ucs2", /* cs name */
"ucs2_bin", /* name */
"", /* comment */