diff options
| author | unknown <joerg@trift-lap.none> | 2007-07-19 14:14:03 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.none> | 2007-07-19 14:14:03 +0200 |
| commit | decc3eecd034be2e0a4924e8c0df2a927ba25865 (patch) | |
| tree | 384b50aefabe8834cf34958a95feda6e244a1ff2 /sql/item_strfunc.cc | |
| parent | 6c0d8d19317c42a14efbc7a8540e9c67f3fbbfcb (diff) | |
| download | mariadb-git-decc3eecd034be2e0a4924e8c0df2a927ba25865.tar.gz | |
Avoid the name conflict between the system-provided "md5.h" and the MySQL one
by renaming "include/md5.h" to "include/my_md5.h".
Fixes bug#14151.
include/my_md5.h:
Rename: include/md5.h -> include/my_md5.h
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 0c24f14c8fe..20a4b64640a 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -28,7 +28,7 @@ #ifdef HAVE_OPENSSL #include <openssl/des.h> #endif /* HAVE_OPENSSL */ -#include "md5.h" +#include "my_md5.h" #include "sha1.h" #include "my_aes.h" C_MODE_START |