diff options
author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
---|---|---|
committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
commit | fc3b3a0a864fd142f65bbd5ff611d2f09041a258 (patch) | |
tree | 94027c861a0c3fd6ad62c4bee7ae5f7b1088f056 /mysys/my_memmem.c | |
parent | 2ff938d21c596d1769076d2703b22120d2cf8336 (diff) | |
parent | 088e2395f1833f16c2ea3f7405f604165b4aa2cc (diff) | |
download | mariadb-git-fc3b3a0a864fd142f65bbd5ff611d2f09041a258.tar.gz |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'mysys/my_memmem.c')
-rw-r--r-- | mysys/my_memmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c index 9230337409d..c000f14bc66 100644 --- a/mysys/my_memmem.c +++ b/mysys/my_memmem.c @@ -22,8 +22,9 @@ Returns a pointer to the beginning of the substring, needle, or NULL if the substring is not found in haystack. */ + void *my_memmem(const void *haystack, size_t haystacklen, - const void *needle, size_t needlelen) + const void *needle, size_t needlelen) { const unsigned char *cursor; const unsigned char *last_possible_needle_location = |