Commit b03700f9 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 50817d30 e7fd63bf
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment