diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-23 15:02:27 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-23 15:02:27 +0300 |
| commit | 844c92364e04fb17371c4a71dee52f179f8ad253 (patch) | |
| tree | b3128ac4cfef425d026d95cd4fd1a55830ef7658 /myisam | |
| parent | 11f402b3108b0c6ef5744bd13164607dd9fba3c0 (diff) | |
| download | mariadb-git-844c92364e04fb17371c4a71dee52f179f8ad253.tar.gz | |
Fixes for Ia64
Docs/manual.texi:
Updated thread safe client chapter + new links
client/sql_string.cc:
Update for Ia64
client/sql_string.h:
Update for Ia64
extra/replace.c:
Update for Ia64
include/config-win.h:
Update for PHP
include/global.h:
Update for PHP
isam/create.c:
Update for Ia64
isam/delete.c:
Update for Ia64
isam/write.c:
Update for Ia64
libmysql/Makefile.shared:
new file
libmysql/libmysql.c:
Update for Ia64
libmysql/net.c:
Update for Ia64
myisam/mi_delete.c:
Update for Ia64
myisam/mi_search.c:
Update for Ia64
sql/field.cc:
Update for Ia64
sql/field.h:
Update for Ia64
sql/item.h:
Update for Ia64
sql/item_strfunc.cc:
Update for Ia64
sql/lock.cc:
Update for Ia64
sql/log.cc:
Update for Ia64
sql/log_event.h:
Update for Ia64
sql/net_serv.cc:
Update for Ia64
sql/sql_list.h:
Update for Ia64
sql/sql_parse.cc:
Update for Ia64
sql/sql_rename.cc:
Update for Ia64
sql/sql_select.cc:
Update for Ia64
sql/sql_show.cc:
Update for Ia64
sql/sql_string.cc:
Update for Ia64
sql/sql_string.h:
Update for Ia64
sql/time.cc:
Update for Ia64
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_delete.c | 8 | ||||
| -rw-r--r-- | myisam/mi_search.c | 2 |
2 files changed, 5 insertions, 5 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]; diff --git a/myisam/mi_search.c b/myisam/mi_search.c index e7a654c4da8..812982082af 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -1588,7 +1588,7 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key, key++; org_key++; } } - if ((new_ref_length= (key - start))) + if ((new_ref_length= (uint) (key - start))) new_ref_length+=pack_marker; } |