diff options
| author | monty@donna.mysql.com <> | 2000-08-23 15:02:27 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-23 15:02:27 +0300 |
| commit | d564acf14eb07cefedf0218c90fd109c61dc6e2f (patch) | |
| tree | b3128ac4cfef425d026d95cd4fd1a55830ef7658 /myisam/mi_delete.c | |
| parent | 7ef8d67d6b7c422aaf57b10b13e80fdcadd69882 (diff) | |
| download | mariadb-git-d564acf14eb07cefedf0218c90fd109c61dc6e2f.tar.gz | |
Fixes for Ia64
Diffstat (limited to 'myisam/mi_delete.c')
| -rw-r--r-- | myisam/mi_delete.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 4c5f3c79e17..d014c07bc96 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -527,7 +527,7 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo, (uchar*) 0, (uchar *) 0, leaf_key, &s_temp); /* t_length will always be > 0 for a new page !*/ - length=(buff+mi_getint(buff))-half_pos; + length=(uint) ((buff+mi_getint(buff))-half_pos); bmove((byte*) buff+p_length+t_length,(byte*) half_pos,(size_t) length); (*keyinfo->store_key)(keyinfo,buff+p_length,&s_temp); mi_putint(buff,length+t_length+p_length,nod_flag); @@ -683,7 +683,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag, DBUG_RETURN(0); /* Error */ if (next_block && nod_flag) *next_block= _mi_kpos(nod_flag,keypos); - s_length=(keypos-start); + s_length=(int) (keypos-start); if (keypos != page_end) { if (keyinfo->flag & HA_BINARY_PACK_KEY) @@ -699,7 +699,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag, (next_length-prev_length)); keypos-=(next_length-prev_length)+prev_pack_length; store_key_length(keypos,prev_length); - s_length=(keypos-start); + s_length=(int) (keypos-start); } } else @@ -746,7 +746,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag, rest_length+=tmp; pack_length= prev_length ? get_pack_length(rest_length): 0; keypos-=tmp+pack_length+prev_pack_length; - s_length=(keypos-start); + s_length=(int) (keypos-start); if (prev_length) /* Pack against prev key */ { *keypos++= start[0]; |