diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 17:02:59 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 17:02:59 -0200 |
| commit | 6997cff45975168618f387e380a3ce62ac93bc8d (patch) | |
| tree | 8b9671ed7e4c19f1f97d8f8347422f15f2432a03 /strings | |
| parent | dc0412d5899538c89a2922406168a5e70ddbceb5 (diff) | |
| parent | 3e9c52250a3ab6664c53ea6b3923acfbe8e09e4e (diff) | |
| download | mariadb-git-6997cff45975168618f387e380a3ce62ac93bc8d.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index ecfac3170d1..09652c5884e 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1205,12 +1205,10 @@ my_strnncoll_utf16(CHARSET_INFO *cs, my_bool t_is_prefix) { int s_res, t_res; - my_wc_t s_wc,t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se= s + slen; const uchar *te= t + tlen; MY_UNICASE_INFO **uni_plane= cs->caseinfo; - LINT_INIT(s_wc); - LINT_INIT(t_wc); while (s < se && t < te) { @@ -1271,11 +1269,9 @@ my_strnncollsp_utf16(CHARSET_INFO *cs, my_bool diff_if_only_endspace_difference) { int res; - my_wc_t s_wc, t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se= s + slen, *te= t + tlen; MY_UNICASE_INFO **uni_plane= cs->caseinfo; - LINT_INIT(s_wc); - LINT_INIT(t_wc); DBUG_ASSERT((slen % 2) == 0); DBUG_ASSERT((tlen % 2) == 0); @@ -1451,17 +1447,15 @@ my_strnncoll_utf16_bin(CHARSET_INFO *cs, my_bool t_is_prefix) { int s_res,t_res; - my_wc_t s_wc,t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se=s+slen; const uchar *te=t+tlen; - LINT_INIT(s_wc); - LINT_INIT(t_wc); while ( s < se && t < te ) { s_res= my_utf16_uni(cs,&s_wc, s, se); t_res= my_utf16_uni(cs,&t_wc, t, te); - + if (s_res <= 0 || t_res <= 0) { /* Incorrect string, compare by char value */ @@ -1471,7 +1465,7 @@ my_strnncoll_utf16_bin(CHARSET_INFO *cs, { return my_bincmp(s, s + s_res, t, t + t_res); } - + s+= s_res; t+= t_res; } @@ -1486,10 +1480,8 @@ my_strnncollsp_utf16_bin(CHARSET_INFO *cs, my_bool diff_if_only_endspace_difference) { int res; - my_wc_t s_wc, t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se= s + slen, *te= t + tlen; - LINT_INIT(s_wc); - LINT_INIT(t_wc); DBUG_ASSERT((slen % 2) == 0); DBUG_ASSERT((tlen % 2) == 0); |