From aef675029f198c61a1a1c46dbb68890f705d40db Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Sep 2002 02:21:29 +0300 Subject: Update mysql-test results after merge include/my_sys.h: Portability fix include/sslopt-longopts.h: Better help for --ssl mysql-test/r/binary.result: Update results after merge mysys/my_malloc.c: Portability fix sql/udf_example.cc: Use longlong instead of 'long long' to make things works on windows --- mysys/my_malloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mysys/my_malloc.c') diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index fc2f22b079a..b273363aaf1 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -73,7 +73,7 @@ gptr my_memdup(const byte *from, uint length, myf MyFlags) } -my_string my_strdup(const char *from, myf MyFlags) +char *my_strdup(const char *from, myf MyFlags) { gptr ptr; uint length=(uint) strlen(from)+1; @@ -83,13 +83,13 @@ my_string my_strdup(const char *from, myf MyFlags) } -gptr my_strdup_with_length(const byte *from, uint length, myf MyFlags) +char *my_strdup_with_length(const byte *from, uint length, myf MyFlags) { gptr ptr; if ((ptr=my_malloc(length+1,MyFlags)) != 0) { memcpy((byte*) ptr, (byte*) from,(size_t) length); - ptr[length]=0; + ((char*) ptr)[length]=0; } - return(ptr); + return((char*) ptr); } -- cgit v1.2.1