Changed my_thread_id to int64 to fix compilation problem with

my_atomic_add32_explicit on windows
Fixed that server_audit.c also works if one compiles with safemalloc
Fixed compiler warnings

1 files changed, 6 insertions, 3 deletions

diff --git a/plugin/simple_password_check/simple_password_check.c b/plugin/simple_password_check/simple_password_check.c
index dadaa0191a2..f6d3e5b7a69 100644
--- a/plugin/simple_password_check/simple_password_check.c
+++ b/plugin/simple_password_check/simple_password_check.c
@@ -49,15 +49,18 @@ static int validate(MYSQL_LEX_STRING *username, MYSQL_LEX_STRING *password)
          others < min_others;
 }
 
-static void fix_min_length(MYSQL_THD thd __attribute__((unused)),
-                           struct st_mysql_sys_var *var,
-                           void *var_ptr, const void *save)
+
+static void
+fix_min_length(MYSQL_THD thd __attribute__((unused)),
+               struct st_mysql_sys_var *var __attribute__((unused)),
+               void *var_ptr, const void *save)
 {
   *((unsigned int *)var_ptr)= *((unsigned int *)save);
   if (min_length < min_digits + 2 * min_letters + min_others)
     min_length= min_digits + 2 * min_letters + min_others;
 }
 
+
 static MYSQL_SYSVAR_UINT(minimal_length, min_length, PLUGIN_VAR_RQCMDARG,
   "Minimal required password length", NULL, fix_min_length, 8, 0, 1000, 1);