Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

2 files changed, 18 insertions, 18 deletions

diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index be05671fb2e..6b0443344e9 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -298,7 +298,7 @@ static size_t big_buffer_alloced= 0;
 static unsigned int query_log_limit= 0;
 
 static char servhost[256];
-static size_t servhost_len;
+static uint servhost_len;
 static char *syslog_ident;
 static char syslog_ident_buffer[128]= "mysql-server_auditing";
 
@@ -620,7 +620,7 @@ static void remove_blanks(char *user)
 
 struct user_name
 {
-  int name_len;
+  size_t name_len;
   char *name;
 };
 
@@ -655,7 +655,7 @@ static int cmp_users(const void *ia, const void *ib)
 {
   const struct user_name *a= (const struct user_name *) ia;
   const struct user_name *b= (const struct user_name *) ib;
-  int dl= a->name_len - b->name_len;
+  int dl= (int)(a->name_len - b->name_len);
   if (dl != 0)
     return dl;
 
@@ -663,7 +663,7 @@ static int cmp_users(const void *ia, const void *ib)
 }
 
 
-static char *coll_search(struct user_coll *c, const char *n, int len)
+static char *coll_search(struct user_coll *c, const char *n, size_t len)
 {
   struct user_name un;
   struct user_name *found;
@@ -675,7 +675,7 @@ static char *coll_search(struct user_coll *c, const char *n, int len)
 }
 
 
-static int coll_insert(struct user_coll *c, char *n, int len)
+static int coll_insert(struct user_coll *c, char *n, size_t len)
 {
   if (c->n_users >= c->n_alloced)
   {
@@ -915,7 +915,7 @@ static void get_str_n(char *dest, int *dest_len, size_t dest_size,
 
   memcpy(dest, src, src_len);
   dest[src_len]= 0;
-  *dest_len= src_len;
+  *dest_len= (int)src_len;
 }
 
 
@@ -1230,7 +1230,7 @@ static void change_connection(struct connection_info *cn,
             event->ip, event->ip_length);
 }
 
-static int write_log(const char *message, int len)
+static int write_log(const char *message, size_t len)
 {
   if (output_type == OUTPUT_FILE)
   {
@@ -1244,7 +1244,7 @@ static int write_log(const char *message, int len)
   {
     syslog(syslog_facility_codes[syslog_facility] |
            syslog_priority_codes[syslog_priority],
-           "%s %.*s", syslog_info, len, message);
+           "%s %.*s", syslog_info, (int)len, message);
   }
   return 0;
 }
@@ -1737,9 +1737,9 @@ static int log_table(const struct connection_info *cn,
   (void) time(&ctime);
   csize= log_header(message, sizeof(message)-1, &ctime,
                     servhost, servhost_len,
-                    event->user, SAFE_STRLEN(event->user),
-                    event->host, SAFE_STRLEN(event->host),
-                    event->ip, SAFE_STRLEN(event->ip),
+                    event->user, (unsigned int)SAFE_STRLEN(event->user),
+                    event->host, (unsigned int)SAFE_STRLEN(event->host),
+                    event->ip, (unsigned int)SAFE_STRLEN(event->ip),
                     event->thread_id, cn->query_id, type);
   csize+= my_snprintf(message+csize, sizeof(message) - 1 - csize,
             ",%.*s,%.*s,",event->database_length, event->database,
@@ -1759,9 +1759,9 @@ static int log_rename(const struct connection_info *cn,
   (void) time(&ctime);
   csize= log_header(message, sizeof(message)-1, &ctime,
                     servhost, servhost_len,
-                    event->user, SAFE_STRLEN(event->user),
-                    event->host, SAFE_STRLEN(event->host),
-                    event->ip, SAFE_STRLEN(event->ip),
+                    event->user, (unsigned int)SAFE_STRLEN(event->user),
+                    event->host, (unsigned int)SAFE_STRLEN(event->host),
+                    event->ip, (unsigned int)SAFE_STRLEN(event->ip),
                     event->thread_id, cn->query_id, "RENAME");
   csize+= my_snprintf(message+csize, sizeof(message) - 1 - csize,
             ",%.*s,%.*s|%.*s.%.*s,",event->database_length, event->database,
@@ -2342,7 +2342,7 @@ static int server_audit_init(void *p __attribute__((unused)))
   if (gethostname(servhost, sizeof(servhost)))
     strcpy(servhost, "unknown");
 
-  servhost_len= strlen(servhost);
+  servhost_len= (uint)strlen(servhost);
 
   logger_init_mutexes();
 #if defined(HAVE_PSI_INTERFACE) && !defined(FLOGGER_NO_PSI)
diff --git a/plugin/server_audit/test_audit_v4.c b/plugin/server_audit/test_audit_v4.c
index 65571b14c11..8cb24bc693b 100644
--- a/plugin/server_audit/test_audit_v4.c
+++ b/plugin/server_audit/test_audit_v4.c
@@ -57,11 +57,11 @@ static int auditing_v4(MYSQL_THD thd, mysql_event_class_t class, const void *ev)
     ev_302.general_error_code= event->general_error_code;
     ev_302.general_thread_id= event->general_thread_id;
     ev_302.general_user= event->general_user.str;
-    ev_302.general_user_length= event->general_user.length;
+    ev_302.general_user_length= (unsigned int)event->general_user.length;
     ev_302.general_command= event->general_command.str;
-    ev_302.general_command_length= event->general_command.length;
+    ev_302.general_command_length= (unsigned int)event->general_command.length;
     ev_302.general_query= event->general_query.str;
-    ev_302.general_query_length= event->general_query.length;
+    ev_302.general_query_length= (unsigned int)event->general_query.length;
     ev_302.general_charset= event->general_charset;
     ev_302.general_time= event->general_time;
     ev_302.general_rows= event->general_rows;