Merge remote-tracking branch 'origin/10.4' into 10.5

5 files changed, 8 insertions, 8 deletions

diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c
index ec0096609ba..65d71a81080 100644
--- a/plugin/auth_pam/auth_pam.c
+++ b/plugin/auth_pam/auth_pam.c
@@ -40,7 +40,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
 {
   int p_to_c[2], c_to_p[2]; /* Parent-to-child and child-to-parent pipes. */
   pid_t proc_id;
-  int result= CR_ERROR, pkt_len;
+  int result= CR_ERROR, pkt_len= 0;
   unsigned char field, *pkt;
 
   PAM_DEBUG((stderr, "PAM: opening pipes.\n"));
diff --git a/plugin/auth_pam/auth_pam_tool.c b/plugin/auth_pam/auth_pam_tool.c
index 3ab2e00c142..3947091ec4a 100644
--- a/plugin/auth_pam/auth_pam_tool.c
+++ b/plugin/auth_pam/auth_pam_tool.c
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
   int res;
   char a_buf[MYSQL_USERNAME_LENGTH + 1 + 1024];
 
-  setreuid(0, 0);
+  (void) setreuid(0, 0);
 
   if (read(0, &field, 1) < 1)
     return -1;
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index 0832e7f390d..b371cb0e706 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -16,7 +16,7 @@
 
 
 #define PLUGIN_VERSION 0x104
-#define PLUGIN_STR_VERSION "1.4.7"
+#define PLUGIN_STR_VERSION "1.4.8"
 
 #define _my_thread_var loc_thread_var
 
@@ -2261,7 +2261,7 @@ static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0)
 }
 
 
-int get_db_mysql57(MYSQL_THD thd, char **name, int *len)
+int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
 {
   int db_off;
   int db_len_off;
@@ -2288,7 +2288,7 @@ int get_db_mysql57(MYSQL_THD thd, char **name, int *len)
 
 #ifdef __linux__
   *name= *(char **) (((char *) thd) + db_off);
-  *len= *((int *) (((char*) thd) + db_len_off));
+  *len= *((size_t *) (((char*) thd) + db_len_off));
   if (*name && (*name)[*len] != 0)
     return 1;
   return 0;
diff --git a/plugin/server_audit/test_audit_v4.c b/plugin/server_audit/test_audit_v4.c
index 8cb24bc693b..f37d8c7c34a 100644
--- a/plugin/server_audit/test_audit_v4.c
+++ b/plugin/server_audit/test_audit_v4.c
@@ -16,7 +16,7 @@ enum enum_server_command{ SERVCOM_A, SERVCOM_B };
 #include "plugin_audit_v4.h"
 
 extern void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev);
-extern int get_db_mysql57(MYSQL_THD thd, char **name, int *len);
+extern int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len);
 
 
 struct mysql_event_general_302
@@ -35,7 +35,7 @@ struct mysql_event_general_302
   unsigned long long general_rows;
   unsigned long long query_id;
   char *database;
-  int database_length;
+  size_t database_length;
 };
 
 
diff --git a/plugin/win_auth_client/common.cc b/plugin/win_auth_client/common.cc
index 4fbddd28c9d..8b7319252ac 100644
--- a/plugin/win_auth_client/common.cc
+++ b/plugin/win_auth_client/common.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by