summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <reggie@monster.>2005-06-06 11:34:52 -0500
committerunknown <reggie@monster.>2005-06-06 11:34:52 -0500
commit6e82d648635706021684cf3d0af3527e617f282c (patch)
tree7fe15c14e9a6363110d49c2354c0b202ab80c4ce /myisam
parent22eeea04903dc0275387fd26cd7bd9cdc8f40f50 (diff)
downloadmariadb-git-6e82d648635706021684cf3d0af3527e617f282c.tar.gz
fixes for compiler warnings from VC6
client/mysqltest.c: undef popen prior to redefining it to avoid compiler warning cast len argument to replace_dynstr_append_mem to int. This should be ok because the replace_dynstr_append method uses strlen to accomplish the same thing. myisam/mi_create.c: cast myisam_block_size down to uint16 to match the struct element block_length mysys/default.c: add (char*) cast to make compiler happy mysys/my_handler.c: add (my_bool) cast to make compiler happy
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_create.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index 12b03e65baa..47332b02a72 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -667,7 +667,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
{
tmp_keydef.keysegs=1;
tmp_keydef.flag= HA_UNIQUE_CHECK;
- tmp_keydef.block_length= myisam_block_size;
+ tmp_keydef.block_length= (uint16)myisam_block_size;
tmp_keydef.keylength= MI_UNIQUE_HASH_LENGTH + pointer;
tmp_keydef.minlength=tmp_keydef.maxlength=tmp_keydef.keylength;
tmp_keyseg.type= MI_UNIQUE_HASH_TYPE;