summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-23 15:02:27 +0300
committerunknown <monty@donna.mysql.com>2000-08-23 15:02:27 +0300
commit844c92364e04fb17371c4a71dee52f179f8ad253 (patch)
treeb3128ac4cfef425d026d95cd4fd1a55830ef7658 /extra
parent11f402b3108b0c6ef5744bd13164607dd9fba3c0 (diff)
downloadmariadb-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 'extra')
-rw-r--r--extra/replace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/replace.c b/extra/replace.c
index 44f117c7969..ef3abda5cc5 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -272,7 +272,7 @@ int insert_pointer_name(reg1 POINTER_ARRAY *pa,my_string name)
pa->max_length=PS_MALLOC-MALLOC_OVERHEAD;
pa->array_allocs=1;
}
- length=strlen(name)+1;
+ length=(uint) strlen(name)+1;
if (pa->length+length >= pa->max_length)
{
if (!(new_pos= (byte*) my_realloc((gptr) pa->str,
@@ -415,7 +415,7 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count,
DBUG_RETURN(0);
}
states+=len+1;
- result_len+=strlen(to[i])+1;
+ result_len+=(uint) strlen(to[i])+1;
if (len > max_length)
max_length=len;
}
@@ -1021,7 +1021,7 @@ FILE *in,*out;
end_of_line++;
if (end_of_line == buffer+bufbytes)
{
- retain=end_of_line - start_of_line;
+ retain= (int) (end_of_line - start_of_line);
break; /* No end of line, read more */
}
save_char=end_of_line[0];