mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
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
This commit is contained in:
parent
5041af524f
commit
3fc15fd38d
1 changed files with 4 additions and 5 deletions
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue