diff options
| author | unknown <bar@mysql.com> | 2007-03-29 10:00:01 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-03-29 10:00:01 +0500 |
| commit | dbc12e4aac6b89ecdac3059664cd37a5d4560134 (patch) | |
| tree | 2ecaa84c6dfd37051da3c771bab8592b45f897fc /strings | |
| parent | 27b333b75c989ed820b8b10612c96cfe9f887822 (diff) | |
| parent | b1c23f112f00a7e9ab05c69dbf314cea2466ba98 (diff) | |
| download | mariadb-git-dbc12e4aac6b89ecdac3059664cd37a5d4560134.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.0.b22378
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 0e28ff7e342..387ce16a43d 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2764,6 +2764,7 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs, const uchar *te=t+tlen; int save_diff = 0; int diff; + MY_UNICASE_INFO **uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -2800,13 +2801,16 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs, static int my_strnncollsp_utf8_cs(CHARSET_INFO *cs, const uchar *s, uint slen, - const uchar *t, uint tlen) + const uchar *t, uint tlen, + my_bool diff_if_only_endspace_difference + __attribute__((unused))) { int s_res,t_res; my_wc_t s_wc,t_wc; const uchar *se= s+slen; const uchar *te= t+tlen; int save_diff = 0; + MY_UNICASE_INFO **uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -2875,6 +2879,7 @@ static MY_COLLATION_HANDLER my_collation_cs_handler = my_strnncoll_utf8_cs, my_strnncollsp_utf8_cs, my_strnxfrm_utf8, + my_strnxfrmlen_utf8, my_like_range_simple, my_wildcmp_mb, my_strcasecmp_utf8, |