diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-08 13:25:25 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-06-08 13:25:25 +0500 |
| commit | 9b9dfb5c0e964bab7de367e3eb9cb5da1f37a41a (patch) | |
| tree | a22a917fafb6c7042b7679ff1c8b53d5581f5710 /strings | |
| parent | a296b986f73301ef1d95e5aac494c9d9f32c08b7 (diff) | |
| parent | 4e4cd276397b953f8495767fb807ffd903f69745 (diff) | |
| download | mariadb-git-9b9dfb5c0e964bab7de367e3eb9cb5da1f37a41a.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-work/mysql-5.0.b28916
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 1263882846d..4dbda0b9239 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -8073,7 +8073,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, @@ -8734,7 +8734,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 f02b5542e78..e7399c5438b 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, uint 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 { |