database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Update mysql-test results after merge

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-09-18 02:21:29 +03:00
parent 70b1d53883
commit dfd0f82b93
5 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysys/my_malloc.c
View File

@ -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);
}