Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/base64.c:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/mysys/base64.c b/mysys/base64.c
index 0165982fb67..c521f352690 100644
--- a/mysys/base64.c
+++ b/mysys/base64.c
@@ -134,7 +134,7 @@ base64_decode(const char *src, size_t size, void *dst)
 {
   char b[3];
   size_t i= 0;
-  void *d= dst;
+  unsigned char *d= (unsigned char*)dst;
   size_t j;
 
   while (i < size)
@@ -186,14 +186,14 @@ base64_decode(const char *src, size_t size, void *dst)
     b[2]= (c >>  0) & 0xff;
 
     for (j=0; j<3-mark; j++)
-      *(char *)d++= b[j];
+      *d++= b[j];
   }
 
   if (i != size)
   {
     return -1;
   }
-  return d - dst;
+  return d - (unsigned char*)dst;
 }