diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-03-11 18:13:42 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-03-11 18:13:42 +0200 |
| commit | f79cb0de91a6b320966a7675dd6998c0bcf128e5 (patch) | |
| tree | 51132996df8dc32fda01ce509f6a6e4e0aca4111 /sql | |
| parent | a43992d78cb5115e2e6eeef623de44f91836922b (diff) | |
| parent | 3033ea85a20fb5afd4cab8a816ff72fd4d784778 (diff) | |
| download | mariadb-git-f79cb0de91a6b320966a7675dd6998c0bcf128e5.tar.gz | |
merge of bug 42434 to 5.1-bugteam
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.cc | 5 | ||||
| -rw-r--r-- | sql/table.cc | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index fc9375e68a5..05b9563c121 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -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; diff --git a/sql/table.cc b/sql/table.cc index 17454ffb012..00a06f51518 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2982,11 +2982,8 @@ void st_table::reset_item_list(List<Item> *item_list) const void TABLE_LIST::calc_md5(char *buffer) { - my_MD5_CTX context; uchar digest[16]; - my_MD5Init(&context); - my_MD5Update(&context,(uchar *) select_stmt.str, select_stmt.length); - my_MD5Final(digest, &context); + MY_MD5_HASH(digest, (uchar *) select_stmt.str, select_stmt.length); sprintf((char *) buffer, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", digest[0], digest[1], digest[2], digest[3], |