summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2006-10-11 16:36:24 +0200
committerunknown <istruewing@chilla.local>2006-10-11 16:36:24 +0200
commite63e690fba7fdb4912243bfde2c359b22951bd09 (patch)
treebcab20e71aa5220d61f076d1097abb1a98616896 /storage
parenta7f8da2904525096fd6cf9c7999ce087ee4d9d4d (diff)
downloadmariadb-git-e63e690fba7fdb4912243bfde2c359b22951bd09.tar.gz
Bug#21627 - Warnings in build of myisampack
Added proper casts No test case. myisampack must be tested manually. storage/myisam/myisampack.c: Bug#21627 - Warnings in build of myisampack Added proper casts
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/myisampack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 556d0f46145..be68ffbdc5a 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -1965,7 +1965,7 @@ static char *bindigits(ulonglong value, uint bits)
DBUG_ASSERT(idx < sizeof(digits));
while (idx)
- *(ptr++)= '0' + ((value >> (--idx)) & 1);
+ *(ptr++)= '0' + ((char) (value >> (--idx)) & (char) 1);
*ptr= '\0';
return digits;
}
@@ -1995,7 +1995,7 @@ static char *hexdigits(ulonglong value)
DBUG_ASSERT(idx < sizeof(digits));
while (idx)
{
- if ((*(ptr++)= '0' + ((value >> (4 * (--idx))) & 0xf)) > '9')
+ if ((*(ptr++)= '0' + ((char) (value >> (4 * (--idx))) & (char) 0xf)) > '9')
*(ptr - 1)+= 'a' - '9' - 1;
}
*ptr= '\0';
@@ -2284,7 +2284,7 @@ static my_off_t write_huff_tree(HUFF_TREE *huff_tree, uint trees)
errors++;
break;
}
- idx+= code & 1;
+ idx+= (uint) code & 1;
if (idx >= length)
{
VOID(fflush(stdout));