diff options
| author | unknown <aivanov@mysql.com> | 2006-06-15 07:24:23 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-06-15 07:24:23 +0400 |
| commit | aab5228292404adb1c462f36fa7da7c881314961 (patch) | |
| tree | 2677fca3328982a7b7b04c014ee5aefff75aa2cc /storage/innobase/mem | |
| parent | abd6f3467d2378224dc60b0fd3abf0ac0b7fab54 (diff) | |
| download | mariadb-git-aab5228292404adb1c462f36fa7da7c881314961.tar.gz | |
Post innodb-5.1-ss594 modifications.
Avoiding compilation error ("void * - unknown size").
Diffstat (limited to 'storage/innobase/mem')
| -rw-r--r-- | storage/innobase/mem/mem0mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c index 3c42c1d0fff..d26e4be3f88 100644 --- a/storage/innobase/mem/mem0mem.c +++ b/storage/innobase/mem/mem0mem.c @@ -144,7 +144,7 @@ mem_heap_cat( void* res = mem_heap_alloc(heap, len1 + len2); memcpy(res, b1, len1); - memcpy(res + len1, b2, len2); + memcpy((char *)res + len1, b2, len2); return(res); } |