summaryrefslogtreecommitdiff
path: root/mysys/mf_casecnv.c
diff options
context:
space:
mode:
authorunknown <serg@infomag.ape.relarn.ru>2000-08-15 21:52:42 +0400
committerunknown <serg@infomag.ape.relarn.ru>2000-08-15 21:52:42 +0400
commit4d820053db1a446969b74a4b586b3f5d42f490d1 (patch)
tree135f6b5b6961c6b7f5bd0d7351d07ae18d9a776f /mysys/mf_casecnv.c
parent264ae115fdcdb6c88eae2aec66c3477cb22a90a5 (diff)
parentc53d371cc9ceb8878ce4cae28e82804124340974 (diff)
downloadmariadb-git-4d820053db1a446969b74a4b586b3f5d42f490d1.tar.gz
Merge
BitKeeper/etc/logging_ok: Auto merged
Diffstat (limited to 'mysys/mf_casecnv.c')
-rw-r--r--mysys/mf_casecnv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_casecnv.c b/mysys/mf_casecnv.c
index 705e1361937..1d63527eb7b 100644
--- a/mysys/mf_casecnv.c
+++ b/mysys/mf_casecnv.c
@@ -32,7 +32,7 @@ void caseup_str(my_string str)
{
#ifdef USE_MB
register uint32 l;
- register char *end=str+strlen(str);
+ register char *end=str+(uint) strlen(str);
if (use_mb(default_charset_info))
while (*str)
{
@@ -51,7 +51,7 @@ void casedn_str(my_string str)
{
#ifdef USE_MB
register uint32 l;
- register char *end=str+strlen(str);
+ register char *end=str+(uint) strlen(str);
if (use_mb(default_charset_info))
while (*str)
{
@@ -144,7 +144,7 @@ int my_strcasecmp(const char *s, const char *t)
{
#ifdef USE_MB
register uint32 l;
- register const char *end=s+strlen(s);
+ register const char *end=s+(uint) strlen(s);
if (use_mb(default_charset_info))
{
while (s<end)