summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-03-30 03:11:37 +0300
committerunknown <monty@mysql.com>2006-03-30 03:11:37 +0300
commit4c0111460bae6b62999c1e17482f5560909cb482 (patch)
tree61eee37f41ff61237d032f69b555961c63a47442 /strings
parent2d6a51b4c8bac3cbed223836f8b2379b9a065d16 (diff)
downloadmariadb-git-4c0111460bae6b62999c1e17482f5560909cb482.tar.gz
Cleanup during review of new pushed code
sql/ha_heap.cc: Indentation fixes strings/ctype-ucs2.c: Simplify code tests/mysql_client_test.c: Remove compiler warnings
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-ucs2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index e172ad3e3d3..2cbd104329e 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -253,8 +253,8 @@ static int my_strnncollsp_ucs2(CHARSET_INFO *cs __attribute__((unused)),
uint minlen;
/* extra safety to make sure the lengths are even numbers */
- slen= (slen >> 1) << 1;
- tlen= (tlen >> 1) << 1;
+ slen= slen & ~(uint) 1;
+ tlen= tlen & ~(uint) 1;
se= s + slen;
te= t + tlen;