diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-10 13:38:22 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-10 13:38:22 -0400 |
| commit | d6e3a9ddcb6a877feb65a98953b3ec9e6426be47 (patch) | |
| tree | 555b6e52dd857768fcf99821dd6c45b62b80dd30 /mysys/my_malloc.c | |
| parent | 9b6a1384114a41beb8b492aed335096ef03c86df (diff) | |
| parent | 8154ca618b68784098dcb8b84ba2cf77707c80e4 (diff) | |
| download | mariadb-git-d6e3a9ddcb6a877feb65a98953b3ec9e6426be47.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ndb_autodiscover3.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 2 |
1 files changed, 1 insertions, 1 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) |