diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-08 13:18:36 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-08 13:18:36 +0500 |
| commit | e2c8d84db1d1b1529f25c18a4c23604f8b4ddeee (patch) | |
| tree | 23e2f076dd40463e757ed0a63fbe050b374a1d1d /strings | |
| parent | 2161964b531c2a8acd503ca388e609107c9cb2fc (diff) | |
| parent | af0a3afe054cc2be3600180cfdeef28761be2f7e (diff) | |
| download | mariadb-git-e2c8d84db1d1b1529f25c18a4c23604f8b4ddeee.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28916
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28916
include/m_ctype.h:
Auto merged
mysys/charset-def.c:
Auto merged
mysys/charset.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 4 | ||||
| -rw-r--r-- | strings/ctype.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index ea0d5a1436a..4d106b5b897 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -8074,7 +8074,7 @@ MY_COLLATION_HANDLER my_collation_ucs2_uca_handler = my_propagate_complex }; -CHARSET_INFO my_charset_ucs2_general_uca= +CHARSET_INFO my_charset_ucs2_unicode_ci= { 128,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -8735,7 +8735,7 @@ static uchar ctype_utf8[] = { extern MY_CHARSET_HANDLER my_charset_utf8_handler; -CHARSET_INFO my_charset_utf8_general_uca_ci= +CHARSET_INFO my_charset_utf8_unicode_ci= { 192,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, diff --git a/strings/ctype.c b/strings/ctype.c index de5625ef074..07f20ccb4ca 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -123,7 +123,7 @@ static struct my_cs_file_section_st * cs_file_sec(const char *attr, size_t len) } #define MY_CS_CSDESCR_SIZE 64 -#define MY_CS_TAILORING_SIZE 128 +#define MY_CS_TAILORING_SIZE 1024 typedef struct my_cs_file_info { |