summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2004-09-14 13:02:20 +0500
committerunknown <bar@mysql.com>2004-09-14 13:02:20 +0500
commit373f1b701489e6932572cac205ef7bf14c0a0467 (patch)
treee465e5eba8c398d967917637a0244a98a551ba58 /strings
parentf21c7b17ed213f37935652dfa42971298894eb2d (diff)
downloadmariadb-git-373f1b701489e6932572cac205ef7bf14c0a0467.tar.gz
ctype-ucs2.c:
Bug#5523 Test failure: 'ctype_uca' Type cast should have been applied to shift and bit-and operation results, not to min_sort_char/max_sort_char before the operation. strings/ctype-ucs2.c: Bug#5523 Test failure: 'ctype_uca' Type cast should have been applied to shift and bit-and operation results, not to min_sort_char/max_sort_char before the operation.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-ucs2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index c6e55ee8f0e..1b3dd296867 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1345,10 +1345,10 @@ my_bool my_like_range_ucs2(CHARSET_INFO *cs,
}
if (ptr[0] == '\0' && ptr[1] == w_one) /* '_' in SQL */
{
- *min_str++= (char) cs->min_sort_char >> 8;
- *min_str++= (char) cs->min_sort_char & 255;
- *max_str++= (char) cs->max_sort_char >> 8;
- *max_str++= (char) cs->max_sort_char & 255;
+ *min_str++= (char) (cs->min_sort_char >> 8);
+ *min_str++= (char) (cs->min_sort_char & 255);
+ *max_str++= (char) (cs->max_sort_char >> 8);
+ *max_str++= (char) (cs->max_sort_char & 255);
continue;
}
if (ptr[0] == '\0' && ptr[1] == w_many) /* '%' in SQL */
@@ -1358,8 +1358,8 @@ my_bool my_like_range_ucs2(CHARSET_INFO *cs,
do {
*min_str++ = 0;
*min_str++ = 0;
- *max_str++ = (char) cs->max_sort_char >>8;
- *max_str++ = (char) cs->max_sort_char & 255;
+ *max_str++ = (char) (cs->max_sort_char >> 8);
+ *max_str++ = (char) (cs->max_sort_char & 255);
} while (min_str + 1 < min_end);
return 0;
}