diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
| commit | 675c3ce2bbe7f033930822dd0ef9126ebb25d44b (patch) | |
| tree | 0d1697348f5ffacdf22ddce0537910d41d6482f0 /sql/item_strfunc.cc | |
| parent | 54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff) | |
| parent | 0d18d930aed47ed97ef3309f9510cfd7a366202e (diff) | |
| download | mariadb-git-675c3ce2bbe7f033930822dd0ef9126ebb25d44b.tar.gz | |
auto-merge
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index a43ad8d8137..7edc1a62307 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -101,13 +101,10 @@ String *Item_func_md5::val_str(String *str) str->set_charset(&my_charset_bin); if (sptr) { - my_MD5_CTX context; unsigned char digest[16]; null_value=0; - my_MD5Init (&context); - my_MD5Update (&context,(unsigned char *) sptr->ptr(), sptr->length()); - my_MD5Final (digest, &context); + MY_MD5_HASH(digest,(unsigned char *) sptr->ptr(), sptr->length()); if (str->alloc(32)) // Ensure that memory is free { null_value=1; |