From 413a80d42bc12d7fddcf9a1fff1c60edab4de60a Mon Sep 17 00:00:00 2001
From: "aivanov@mysql.com" <>
Date: Thu, 15 Jun 2006 07:24:23 +0400
Subject: Post innodb-5.1-ss594 modifications.  Avoiding compilation error
 ("void * - unknown size").

---
 storage/innobase/mem/mem0mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'storage/innobase')

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);
 }
-- 
cgit v1.2.1