diff options
| author | konstantin@bodhi.netgear <> | 2006-07-06 22:55:48 +0400 |
|---|---|---|
| committer | konstantin@bodhi.netgear <> | 2006-07-06 22:55:48 +0400 |
| commit | 01bc761690738a857540f22389d0328c91492be7 (patch) | |
| tree | a054d3ff659c59af94637b315fc1234edc00dbcf /mysys | |
| parent | f22a50a93b5a094554176499e489631b9cab0fe2 (diff) | |
| parent | e29ea3f2efc660c30e1ec4102be11689045b7930 (diff) | |
| download | mariadb-git-01bc761690738a857540f22389d0328c91492be7.tar.gz | |
Merge bodhi.netgear:/opt/local/work/tmp_merge
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_malloc.c | 2 | ||||
| -rw-r--r-- | mysys/safemalloc.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 3fb3866f79c..9dd5530bd28 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -83,7 +83,7 @@ char *my_strdup(const char *from, myf my_flags) } -char *my_strndup(const byte *from, uint length, myf my_flags) +char *my_strndup(const char *from, uint length, myf my_flags) { gptr ptr; if ((ptr=my_malloc(length+1,my_flags)) != 0) diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index e40fd751037..b431667063a 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -525,9 +525,8 @@ char *_my_strdup(const char *from, const char *filename, uint lineno, } /* _my_strdup */ -char *_my_strndup(const byte *from, uint length, - const char *filename, uint lineno, - myf MyFlags) +char *_my_strndup(const char *from, uint length, const char *filename, + uint lineno, myf MyFlags) { gptr ptr; if ((ptr=_mymalloc(length+1,filename,lineno,MyFlags)) != 0) |