summaryrefslogtreecommitdiff
path: root/mysys/my_malloc.c
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2006-06-27 14:56:24 +0400
committerkonstantin@mysql.com <>2006-06-27 14:56:24 +0400
commit3cf181bb648bddb68a03c24f2ff892f9d21604ff (patch)
treeab6cc503abd315c5b2523995d5b6a0392fa16cc2 /mysys/my_malloc.c
parent5576ef27c61cb79e33f4d0074741f25c9a40931d (diff)
downloadmariadb-git-3cf181bb648bddb68a03c24f2ff892f9d21604ff.tar.gz
Fix compilation failures on Windows caused by the patch for Bug#17199.
Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled without blackhole).
Diffstat (limited to 'mysys/my_malloc.c')
-rw-r--r--mysys/my_malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 3f601a42dc9..f33db2655c4 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_strdup_with_length(const byte *from, uint length, myf my_flags)
+char *my_strdup_with_length(const char *from, uint length, myf my_flags)
{
gptr ptr;
if ((ptr=my_malloc(length+1,my_flags)) != 0)