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

merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except

Browse source 
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
This commit is contained in:
Guilhem Bichot 2009-04-01 11:34:52 +02:00
commit c71aae73f6
405 changed files with 26858 additions and 5422 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;