diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-05-31 02:01:28 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-05-31 02:01:28 +0300 |
| commit | 3fc15fd38d003f456e0b7150d0bc6fca13624c4c (patch) | |
| tree | 0add6a9eccff07219e4d5b80515ed189c1726733 | |
| parent | 5041af524f5069ca33091a7034a3b42c58ce652b (diff) | |
| download | mariadb-git-3fc15fd38d003f456e0b7150d0bc6fca13624c4c.tar.gz | |
item_strfunc.cc renamed MD5* to my_MD5* to avoid name clashes with openssl library
sql/item_strfunc.cc:
renamed MD5* to my_MD5* to avoid name clashes with openssl library
| -rw-r--r-- | sql/item_strfunc.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 80f72c30e57..9d69b713611 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -30,7 +30,6 @@ #ifdef HAVE_CRYPT_H #include <crypt.h> #endif - #include "md5.h" String empty_string(""); @@ -66,13 +65,13 @@ String *Item_func_md5::val_str(String *str) String * sptr= args[0]->val_str(str); if (sptr) { - MD5_CTX context; + my_MD5_CTX context; unsigned char digest[16]; null_value=0; - MD5Init (&context); - MD5Update (&context,(unsigned char *) sptr->ptr(), sptr->length()); - MD5Final (digest, &context); + my_MD5Init (&context); + my_MD5Update (&context,(unsigned char *) sptr->ptr(), sptr->length()); + my_MD5Final (digest, &context); str->alloc(32); // Ensure that memory is free sprintf((char *) str->ptr(), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", |