summaryrefslogtreecommitdiff
path: root/sql/password.c
diff options
context:
space:
mode:
Diffstat (limited to 'sql/password.c')
-rw-r--r--sql/password.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/password.c b/sql/password.c
index debdf598189..75ac210acd3 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -60,7 +60,7 @@
*****************************************************************************/
-#include <my_global.h>
+#include "mariadb.h"
#include <my_sys.h>
#include <m_string.h>
#include <password.h>
@@ -296,7 +296,7 @@ void make_password_from_salt_323(char *to, const ulong *salt)
buf+len*2
*/
-char *octet2hex(char *to, const char *str, uint len)
+char *octet2hex(char *to, const char *str, size_t len)
{
const char *str_end= str + len;
for (; str != str_end; ++str)