mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 04:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge of bug 42434 to 5.1-bugteam

Browse source
This commit is contained in:
Georgi Kodinov 2009-03-11 18:13:42 +02:00
commit f79cb0de91
4 changed files with 290 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/item_strfunc.cc
View file

@ -105,13 +105,10 @@ String *Item_func_md5::val_str(String *str)
str->set_charset(&my_charset_bin);
if (sptr)
{
my_MD5_CTX context;
uchar digest[16];
null_value=0;
my_MD5Init (&context);
my_MD5Update (&context,(uchar *) sptr->ptr(), sptr->length());
my_MD5Final (digest, &context);
MY_MD5_HASH(digest,(uchar *) sptr->ptr(), sptr->length());
if (str->alloc(32)) // Ensure that memory is free
{
null_value=1;