MDEV-13384 - misc Windows warnings fixed

51 files changed, 158 insertions, 144 deletions

diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 7f83905547b..afa39e6a5f7 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -409,7 +409,7 @@ unsigned int ha_archive::pack_row_v1(uchar *record)
       pos+= length;
     }
   }
-  DBUG_RETURN(pos - record_buffer->buffer);
+  DBUG_RETURN((int)(pos - record_buffer->buffer));
 }
 
 /*
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 9b6db947806..a7052188a5d 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -1563,7 +1563,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
 				n = strlen(s);
 
 			if (IsJson(args, i))
-				j = strchr(s, '_') - s + 1;
+				j = (int)(strchr(s, '_') - s + 1);
 
 			if (j && n > j) {
 				s += j;
diff --git a/storage/connect/plugutil.cpp b/storage/connect/plugutil.cpp
index d63674e2e36..dbf90fb5599 100644
--- a/storage/connect/plugutil.cpp
+++ b/storage/connect/plugutil.cpp
@@ -534,7 +534,7 @@ void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
     if (trace)
       htrc("PlugSubAlloc: %s\n", g->Message);
 
-		throw 1234;
+    abort();
     } /* endif size OS32 code */
 
   /*********************************************************************/
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp
index 196ac16c7b0..b9c97bd2f40 100644
--- a/storage/connect/tabmysql.cpp
+++ b/storage/connect/tabmysql.cpp
@@ -681,7 +681,7 @@ bool TDBMYSQL::MakeCommand(PGLOBAL g)
       strlwr(strcpy(name, Name));     // Not a keyword
 
     if ((p = strstr(qrystr, name))) {
-      Query->Set(Qrystr, p - qrystr);
+      Query->Set(Qrystr, (uint)(p - qrystr));
 
       if (qtd && *(p-1) == ' ') {
         Query->Append('`');
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 970c503497f..08c4b226e22 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -216,7 +216,7 @@ void ha_heap::update_key_stats()
       else
       {
         ha_rows hash_buckets= file->s->keydef[i].hash_buckets;
-        ha_rows no_records= hash_buckets ? (file->s->records/hash_buckets) : 2;
+        ulong no_records= hash_buckets ? (ulong)(file->s->records/hash_buckets) : 2;
         if (no_records < 2)
           no_records= 2;
         key->rec_per_key[key->user_defined_key_parts-1]= no_records;
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 061ff1ce2ac..d291f6f7c37 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -163,6 +163,7 @@ IF(NOT TARGET innobase)
   RETURN()
 ENDIF()
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 # A GCC bug causes crash when compiling these files on ARM64 with -O1+
 # Compile them with -O0 as a workaround.
 IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
@@ -170,7 +171,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
   EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                   OUTPUT_VARIABLE GCC_VERSION)
   IF(GCC_VERSION VERSION_LESS 5.2)
-    INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
     ADD_COMPILE_FLAGS(
       btr/btr0btr.cc
       btr/btr0cur.cc
@@ -180,5 +180,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
       )
   ENDIF()
 ENDIF()
+IF(MSVC)
+  # silence "switch statement contains 'default' but no 'case' label
+  # on generated file.
+  TARGET_COMPILE_OPTIONS(innobase PRIVATE "/wd4065")
+ENDIF()
 
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup)
diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc
index 3c2b697b0f4..f7ea768f5c1 100644
--- a/storage/innobase/buf/buf0rea.cc
+++ b/storage/innobase/buf/buf0rea.cc
@@ -292,8 +292,8 @@ buf_read_ahead_random(
 			     node != NULL;
 			     node = UT_LIST_GET_NEXT(chain, node)) {
 
-				size += os_file_get_size(node->handle)
-					/ page_size.physical();
+				size += ulint(os_file_get_size(node->handle)
+					/ page_size.physical());
 			}
 
 			ut_ad(size == space->size);
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 5e7e5a2f21b..08a832a4cd5 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -1324,7 +1324,7 @@ fil_crypt_realloc_iops(
 	if (10 * state->cnt_waited > state->batch) {
 		/* if we waited more than 10% re-estimate max_iops */
 		ulint avg_wait_time_us =
-			state->sum_waited_us / state->cnt_waited;
+			ulint(state->sum_waited_us / state->cnt_waited);
 
 		if (avg_wait_time_us == 0) {
 			avg_wait_time_us = 1; // prevent division by zero
@@ -1669,7 +1669,7 @@ fil_crypt_get_page_throttle_func(
 
 	/* average page load */
 	ulint add_sleeptime_ms = 0;
-	ulint avg_wait_time_us = state->sum_waited_us / state->cnt_waited;
+	ulint avg_wait_time_us =ulint(state->sum_waited_us / state->cnt_waited);
 	ulint alloc_wait_us = 1000000 / state->allocated_iops;
 
 	if (avg_wait_time_us < alloc_wait_us) {
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 2ebdd259e93..d04971af25d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -2181,7 +2181,7 @@ convert_error_code_to_mysql(
 		bool comp = !!(flags & DICT_TF_COMPACT);
 		ulint free_space = page_get_free_space_of_empty(comp) / 2;
 
-		if (free_space >= (comp ? COMPRESSED_REC_MAX_DATA_SIZE :
+		if (free_space >= ulint(comp ? COMPRESSED_REC_MAX_DATA_SIZE :
 				          REDUNDANT_REC_MAX_DATA_SIZE)) {
 			free_space = (comp ? COMPRESSED_REC_MAX_DATA_SIZE :
 				REDUNDANT_REC_MAX_DATA_SIZE) - 1;
@@ -11850,7 +11850,7 @@ err_col:
 			err = row_create_table_for_mysql(
 				table, m_trx, false,
 				(fil_encryption_t)options->encryption,
-				options->encryption_key_id);
+				(uint32_t)options->encryption_key_id);
 		}
 
 		DBUG_EXECUTE_IF("ib_crash_during_create_for_encryption",
@@ -15472,7 +15472,7 @@ ha_innobase::update_table_comment(
 {
 	uint	length = (uint) strlen(comment);
 	char*	str=0;
-	long	flen;
+	size_t	flen;
 	std::string fk_str;
 
 	/* We do not know if MySQL can call this function before calling
@@ -15500,9 +15500,7 @@ ha_innobase::update_table_comment(
 
 	flen = fk_str.length();
 
-	if (flen < 0) {
-		flen = 0;
-	} else if (length + flen + 3 > 64000) {
+	if (length + flen + 3 > 64000) {
 		flen = 64000 - 3 - length;
 	}
 	/* allocate buffer for the full string */
@@ -22139,8 +22137,8 @@ innobase_find_mysql_table_for_vc(
 	char	dbname[MAX_DATABASE_NAME_LEN + 1];
 	char	tbname[MAX_TABLE_NAME_LEN + 1];
 	char*	name = table->name.m_name;
-	uint	dbnamelen = dict_get_db_name_len(name);
-	uint	tbnamelen = strlen(name) - dbnamelen - 1;
+	uint	dbnamelen = (uint) dict_get_db_name_len(name);
+	uint	tbnamelen = (uint) strlen(name) - dbnamelen - 1;
 	char	t_dbname[MAX_DATABASE_NAME_LEN + 1];
 	char	t_tbname[MAX_TABLE_NAME_LEN + 1];
 
@@ -22155,7 +22153,6 @@ innobase_find_mysql_table_for_vc(
 
 	if (is_part != NULL) {
 		*is_part = '\0';
-		tbnamelen = is_part - tbname;
 	}
 
 	dbnamelen = filename_to_tablename(dbname, t_dbname,
@@ -22665,7 +22662,7 @@ innobase_convert_to_filename_charset(
 
 	return(static_cast<uint>(strconvert(
 				cs_from, from, strlen(from),
-				cs_to, to, static_cast<size_t>(len), &errors)));
+				cs_to, to, static_cast<uint>(len), &errors)));
 }
 
 /**********************************************************************
@@ -22684,7 +22681,7 @@ innobase_convert_to_system_charset(
 
 	return(static_cast<uint>(strconvert(
 				cs1, from, strlen(from),
-				cs2, to, static_cast<size_t>(len), errors)));
+				cs2, to, static_cast<uint>(len), errors)));
 }
 
 /**********************************************************************
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index ee8e06ea19f..322a39813d1 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -326,7 +326,7 @@ my_error_innodb(
 		bool comp = !!(flags & DICT_TF_COMPACT);
 		ulint free_space = page_get_free_space_of_empty(comp) / 2;
 
-		if (free_space >= (comp ? COMPRESSED_REC_MAX_DATA_SIZE :
+		if (free_space >= ulint(comp ? COMPRESSED_REC_MAX_DATA_SIZE :
 					  REDUNDANT_REC_MAX_DATA_SIZE)) {
 			free_space = (comp ? COMPRESSED_REC_MAX_DATA_SIZE :
 				REDUNDANT_REC_MAX_DATA_SIZE) - 1;
diff --git a/storage/innobase/include/fsp0pagecompress.ic b/storage/innobase/include/fsp0pagecompress.ic
index f4b95162b2a..d1f2ea45fbd 100644
--- a/storage/innobase/include/fsp0pagecompress.ic
+++ b/storage/innobase/include/fsp0pagecompress.ic
@@ -82,7 +82,7 @@ UNIV_INLINE
 const char*
 fil_get_compression_alg_name(
 /*=========================*/
-       ulint	comp_alg)	/*!<in: compression algorithm number */
+       ib_uint64_t	comp_alg)	/*!<in: compression algorithm number */
 {
 	switch(comp_alg) {
 	case PAGE_UNCOMPRESSED:
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index b366267d6d2..f78336fc2da 100644
--- a/storage/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
@@ -638,6 +638,9 @@ os_file_create_simple_no_error_handling_func(
 	bool*		success)
 	MY_ATTRIBUTE((warn_unused_result));
 
+#ifdef  _WIN32
+#define os_file_set_nocache(fd, file_name, operation_name) do{}while(0)
+#else
 /** Tries to disable OS caching on an opened file descriptor.
 @param[in]	fd		file descriptor to alter
 @param[in]	file_name	file name, used in the diagnostic message
@@ -646,9 +649,10 @@ os_file_create_simple_no_error_handling_func(
 void
 os_file_set_nocache(
 /*================*/
-	os_file_t	fd,		/*!< in: file descriptor to alter */
+	int	fd,		/*!< in: file descriptor to alter */
 	const char*	file_name,
 	const char*	operation_name);
+#endif
 
 /** NOTE! Use the corresponding macro os_file_create(), not directly
 this function!
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h
index 8d08416cccd..d7583f87f3b 100644
--- a/storage/innobase/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
@@ -1192,10 +1192,16 @@ struct MY_ALIGNED(CPU_LEVEL1_DCACHE_LINESIZE) simple_counter
 	{
 		compile_time_assert(!atomic || sizeof(Type) == sizeof(lint));
 		if (atomic) {
-			/* Silence MSVS warnings when instantiating
-			this template with atomic=false. */
+#ifdef _MSC_VER
+// Suppress type conversion/ possible loss of data warning
+#pragma warning (push)
+#pragma warning (disable : 4244)
+#endif
 			return Type(my_atomic_addlint(reinterpret_cast<lint*>
 						      (&m_counter), i));
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
 		} else {
 			return m_counter += i;
 		}
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 0c015be12f2..31b5cc437f3 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -5254,6 +5254,7 @@ os_file_handle_error_no_exit(
 			name, operation, false, on_error_silent));
 }
 
+#ifndef _WIN32
 /** Tries to disable OS caching on an opened file descriptor.
 @param[in]	fd		file descriptor to alter
 @param[in]	file_name	file name, used in the diagnostic message
@@ -5261,7 +5262,7 @@ os_file_handle_error_no_exit(
 				message */
 void
 os_file_set_nocache(
-	os_file_t	fd		MY_ATTRIBUTE((unused)),
+	int	fd		MY_ATTRIBUTE((unused)),
 	const char*	file_name	MY_ATTRIBUTE((unused)),
 	const char*	operation_name	MY_ATTRIBUTE((unused)))
 {
@@ -5310,6 +5311,8 @@ short_warning:
 #endif /* defined(UNIV_SOLARIS) && defined(DIRECTIO_ON) */
 }
 
+#endif /* _WIN32 */
+
 /** Write the specified number of zeros to a newly created file.
 @param[in]	name		name of the file or path as a null-terminated
 				string
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index cffc40af835..69ad8e3ad0f 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -4016,7 +4016,7 @@ row_merge_file_create(
 
 	if (merge_file->fd >= 0) {
 		if (srv_disable_sort_file_cache) {
-			os_file_set_nocache((os_file_t)merge_file->fd,
+			os_file_set_nocache(merge_file->fd,
 				"row0merge.cc", "sort");
 		}
 	}
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index bd3c5a3d8bc..d7e1e062d7a 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -1898,9 +1898,6 @@ innobase_start_or_create_for_mysql()
 		return(srv_init_abort(DB_ERROR));
 	}
 
-	compile_time_assert(ulonglong(ULINT_MAX) * UNIV_PAGE_SIZE_MIN
-			    >= 512ULL << 30);
-
 	os_normalize_path(srv_data_home);
 
 	/* Check if the data files exist or not. */
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 33ec4ea7db1..0c642aa6c65 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -405,7 +405,7 @@ static void _ma_check_print_msg(HA_CHECK *param, const char *msg_type,
 {
   THD *thd= (THD *) param->thd;
   Protocol *protocol= thd->protocol;
-  uint length, msg_length;
+  size_t length, msg_length;
   char msgbuf[MYSQL_ERRMSG_SIZE];
   char name[NAME_LEN * 2 + 2];
 
@@ -442,10 +442,10 @@ static void _ma_check_print_msg(HA_CHECK *param, const char *msg_type,
     push_warning).
   */
   protocol->prepare_for_resend();
-  protocol->store(name, length, system_charset_info);
+  protocol->store(name, (uint)length, system_charset_info);
   protocol->store(param->op_name, system_charset_info);
   protocol->store(msg_type, system_charset_info);
-  protocol->store(msgbuf, msg_length, system_charset_info);
+  protocol->store(msgbuf, (uint)msg_length, system_charset_info);
   if (protocol->write())
     sql_print_error("Failed on my_net_write, writing to stderr instead: %s.%s: %s\n",
                     param->db_name, param->table_name, msgbuf);
@@ -3427,7 +3427,7 @@ bool maria_show_status(handlerton *hton,
     {
       char *file;
       const char *status;
-      uint length, status_len;
+      size_t length, status_len;
       MY_STAT stat_buff, *stat;
       const char error[]= "can't stat";
       char object[SHOW_MSG_LEN];
@@ -3455,8 +3455,8 @@ bool maria_show_status(handlerton *hton,
           status= needed;
           status_len= sizeof(needed) - 1;
         }
-        length= my_snprintf(object, SHOW_MSG_LEN, "Size %12lu ; %s",
-                            (ulong) stat->st_size, file);
+        length= my_snprintf(object, SHOW_MSG_LEN, "Size %12llu ; %s",
+                            (ulonglong) stat->st_size, file);
       }
 
       print(thd, engine_name->str, engine_name->length,
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c
index 57596558208..b965f5db34b 100644
--- a/storage/maria/ma_blockrec.c
+++ b/storage/maria/ma_blockrec.c
@@ -7540,7 +7540,7 @@ void _ma_print_block_info(MARIA_SHARE *share, uchar *buff)
 {
   LSN lsn= lsn_korr(buff);
 
-  printf("LSN: %lu,0x%lx  type: %u  dir_entries: %u  dir_free: %u  empty_space: %u\n",
+  printf("LSN:" LSN_FMT " type: %u  dir_entries: %u  dir_free: %u  empty_space: %u\n",
          LSN_IN_PARTS(lsn),
          (uint)buff[PAGE_TYPE_OFFSET],
          (uint)buff[DIR_COUNT_OFFSET],
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 078ef813605..7caec1fd834 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -772,7 +772,7 @@ static
 void maria_collect_stats_nonulls_first(HA_KEYSEG *keyseg, ulonglong *notnull,
                                        const uchar *key)
 {
-  uint first_null, kp;
+  size_t first_null, kp;
   first_null= ha_find_null(keyseg, key) - keyseg;
   /*
     All prefix tuples that don't include keypart_{first_null} are not-null
@@ -814,7 +814,7 @@ int maria_collect_stats_nonulls_next(HA_KEYSEG *keyseg, ulonglong *notnull,
                                      const uchar *last_key)
 {
   uint diffs[2];
-  uint first_null_seg, kp;
+  size_t first_null_seg, kp;
   HA_KEYSEG *seg;
 
   /*
@@ -5671,7 +5671,7 @@ static int sort_maria_ft_key_write(MARIA_SORT_PARAM *sort_param,
       key_block++;
     sort_info->key_block=key_block;
     sort_param->keyinfo= &share->ft2_keyinfo;
-    ft_buf->count=(ft_buf->buf - p)/val_len;
+    ft_buf->count=(uint)(ft_buf->buf - p)/val_len;
 
     /* flushing buffer to second-level tree */
     for (error=0; !error && p < ft_buf->buf; p+= val_len)
diff --git a/storage/maria/ma_key.c b/storage/maria/ma_key.c
index 89693f45dca..6f3e17ed80d 100644
--- a/storage/maria/ma_key.c
+++ b/storage/maria/ma_key.c
@@ -318,7 +318,7 @@ MARIA_KEY *_ma_make_key(MARIA_HA *info, MARIA_KEY *int_key, uint keynr,
     key+= length;
   }
   _ma_dpointer(info->s, key, filepos);
-  int_key->data_length= (key - int_key->data);
+  int_key->data_length= (uint)(key - int_key->data);
   int_key->ref_length= info->s->rec_reflength;
   int_key->flag= 0;
   if (_ma_have_versioning(info) && trid)
@@ -449,7 +449,7 @@ MARIA_KEY *_ma_pack_key(register MARIA_HA *info, MARIA_KEY *int_key,
   /* set flag to SEARCH_PART_KEY if we are not using all key parts */
   int_key->flag= keyseg->type ? SEARCH_PART_KEY : 0;
   int_key->ref_length= 0;
-  int_key->data_length= (key - int_key->data);
+  int_key->data_length= (uint)(key - int_key->data);
 
   DBUG_PRINT("exit", ("length: %u", int_key->data_length));
   DBUG_RETURN(int_key);
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index c9d2362d7e2..ce254c5f631 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -1770,11 +1770,11 @@ static void translog_new_page_header(TRANSLOG_ADDRESS *horizon,
     ptr+= TRANSLOG_PAGE_SIZE / DISK_DRIVE_SECTOR_SIZE;
   }
   {
-    uint len= (ptr - cursor->ptr);
+    size_t len= (ptr - cursor->ptr);
     (*horizon)+= len; /* increasing the offset part of the address */
-    cursor->current_page_fill= len;
+    cursor->current_page_fill= (uint16)len;
     if (!cursor->chaser)
-      cursor->buffer->size+= len;
+      cursor->buffer->size+= (translog_size_t)len;
   }
   cursor->ptr= ptr;
   DBUG_PRINT("info", ("NewP buffer #%u: %p  chaser: %d  Size: %lu (%lu)  "
@@ -1885,14 +1885,14 @@ static void translog_finish_page(TRANSLOG_ADDRESS *horizon,
   DBUG_PRINT("enter", ("Buffer: #%u %p  "
                        "Buffer addr: " LSN_FMT "  "
                        "Page addr: " LSN_FMT "  "
-                       "size:%lu (%lu)  Pg:%u  left:%u",
+                       "size:%u (%u)  Pg:%u  left:%u",
                        (uint) cursor->buffer_no, cursor->buffer,
                        LSN_IN_PARTS(cursor->buffer->offset),
-                       LSN_FILE_NO(*horizon),
-                       (LSN_OFFSET(*horizon) -
+                       (uint)LSN_FILE_NO(*horizon),
+                       (uint)(LSN_OFFSET(*horizon) -
                                 cursor->current_page_fill),
-                       (ulong) cursor->buffer->size,
-                       (ulong) (cursor->ptr -cursor->buffer->buffer),
+                       (uint) cursor->buffer->size,
+                       (uint) (cursor->ptr -cursor->buffer->buffer),
                        (uint) cursor->current_page_fill, (uint) left));
   DBUG_ASSERT(LSN_FILE_NO(*horizon) == LSN_FILE_NO(cursor->buffer->offset));
   translog_check_cursor(cursor);
@@ -2637,8 +2637,8 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
     {
       DBUG_PRINT("error",
                  ("Can't write page " LSN_FMT " to pagecache, error: %d",
-                  (ulong) buffer->file->number,
-                  (ulong) (LSN_OFFSET(buffer->offset)+ i),
+                  buffer->file->number,
+                  (uint)(LSN_OFFSET(buffer->offset)+ i),
                   my_errno));
       translog_stop_writing();
       DBUG_RETURN(1);
@@ -2653,8 +2653,8 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
   {
     DBUG_PRINT("error", ("Can't write buffer " LSN_FMT " size %lu "
                          "to the disk (%d)",
-                         (ulong) file->handler.file,
-                         (ulong) LSN_OFFSET(buffer->offset),
+                         (uint) file->handler.file,
+                         (uint) LSN_OFFSET(buffer->offset),
                          (ulong) buffer->size, errno));
     translog_stop_writing();
     DBUG_RETURN(1);
@@ -2877,7 +2877,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
     DBUG_PRINT("error", ("Page " LSN_FMT ": "
                          "page address written in the page is incorrect: "
                          "File %lu instead of %lu or page %lu instead of %lu",
-                         (ulong) data->number, (ulong) offset,
+                         (uint)data->number, (uint)offset,
                          (ulong) uint3korr(page + 3), (ulong) data->number,
                          (ulong) uint3korr(page),
                          (ulong) page_no));
@@ -2890,7 +2890,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
   {
     DBUG_PRINT("error", ("Page " LSN_FMT ": "
                          "Garbage in the page flags field detected : %x",
-                         (ulong) data->number, (ulong) offset,
+                         (uint) data->number, (uint) offset,
                          (uint) flags));
     DBUG_RETURN(1);
   }
@@ -2904,7 +2904,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
     {
       DBUG_PRINT("error", ("Page " LSN_FMT ": "
                            "CRC mismatch: calculated: %lx on the page %lx",
-                           (ulong) data->number, (ulong) offset,
+                           (uint) data->number, (uint) offset,
                            (ulong) crc, (ulong) uint4korr(page_pos)));
       DBUG_RETURN(1);
     }
@@ -4892,7 +4892,7 @@ static uint translog_get_current_page_rest()
 
 static uint translog_get_current_buffer_rest()
 {
-  return ((log_descriptor.bc.buffer->buffer + TRANSLOG_WRITE_BUFFER -
+  return (uint)((log_descriptor.bc.buffer->buffer + TRANSLOG_WRITE_BUFFER -
            log_descriptor.bc.ptr) /
           TRANSLOG_PAGE_SIZE);
 }
@@ -5087,10 +5087,10 @@ translog_write_variable_record_1group(LSN *lsn,
                                                  &horizon, &cursor))
     DBUG_RETURN(1);
     DBUG_PRINT("info", ("absolute horizon: " LSN_FMT "  local: " LSN_FMT,
-                        (ulong) LSN_FILE_NO(log_descriptor.horizon),
-                        (ulong) LSN_OFFSET(log_descriptor.horizon),
-                        (ulong) LSN_FILE_NO(horizon),
-                        (ulong) LSN_OFFSET(horizon)));
+                        (uint) LSN_FILE_NO(log_descriptor.horizon),
+                        (uint) LSN_OFFSET(log_descriptor.horizon),
+                        (uint) LSN_FILE_NO(horizon),
+                        (uint) LSN_OFFSET(horizon)));
 
   translog_buffer_lock(cursor.buffer);
   translog_buffer_decrease_writers(cursor.buffer);
@@ -6624,11 +6624,11 @@ static my_bool translog_scanner_eol(TRANSLOG_SCANNER_DATA *scanner)
 {
   DBUG_ENTER("translog_scanner_eol");
   DBUG_PRINT("enter",
-             ("Horizon: " LSN_FMT "  Current: (%lu, 0x%lx+0x%x=0x%lx)",
+             ("Horizon: " LSN_FMT "  Current: (%u, 0x%x+0x%x=0x%x)",
               LSN_IN_PARTS(scanner->horizon),
               LSN_IN_PARTS(scanner->page_addr),
               (uint) scanner->page_offset,
-              (ulong) (LSN_OFFSET(scanner->page_addr) + scanner->page_offset)));
+              (uint) (LSN_OFFSET(scanner->page_addr) + scanner->page_offset)));
   if (scanner->horizon > (scanner->page_addr +
                           scanner->page_offset))
   {
@@ -6834,7 +6834,7 @@ translog_variable_length_header(uchar *page, translog_size_t page_offset,
     src+= (2 + 2);
     page_rest= (uint16) (TRANSLOG_PAGE_SIZE - (src - page));
     curr= 0;
-    header_to_skip= src - (page + page_offset);
+    header_to_skip= (uint) (src - (page + page_offset));
     buff->chunk0_pages= 0;
 
     for (;;)
@@ -7465,8 +7465,8 @@ static void translog_force_current_buffer_to_finish()
                        (uint) old_buffer_no,
                        old_buffer,
                        LSN_IN_PARTS(old_buffer->offset),
-                       (ulong) LSN_FILE_NO(log_descriptor.horizon),
-                       (ulong) (LSN_OFFSET(log_descriptor.horizon) -
+                       LSN_FILE_NO(log_descriptor.horizon),
+                       (uint)(LSN_OFFSET(log_descriptor.horizon) -
                                 log_descriptor.bc.current_page_fill),
                        (ulong) old_buffer->size,
                        (ulong) (log_descriptor.bc.ptr -log_descriptor.bc.
diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c
index 8a51ff99fc2..256cb2b45b2 100644
--- a/storage/maria/ma_recovery.c
+++ b/storage/maria/ma_recovery.c
@@ -3349,7 +3349,7 @@ static LSN parse_checkpoint_record(LSN lsn)
                  page_id, rec_lsn, next_dirty_page_in_pool++))
       return LSN_ERROR;
     if (maria_recovery_verbose)
-      tprint(tracef, "%8u  %8u  %12lu    %lu,0x%lx\n", (uint) table_id,
+      tprint(tracef, "%8u  %8u  %12lu    " LSN_FMT "\n", (uint) table_id,
              (uint) is_index, (ulong) page_id, LSN_IN_PARTS(rec_lsn));
     set_if_smaller(minimum_rec_lsn_of_dirty_pages, rec_lsn);
   }
diff --git a/storage/maria/ma_rt_index.c b/storage/maria/ma_rt_index.c
index c92045eb245..4c18bff7c70 100644
--- a/storage/maria/ma_rt_index.c
+++ b/storage/maria/ma_rt_index.c
@@ -105,7 +105,7 @@ static int maria_rtree_find_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
                                             level + 1)))
         {
           case 0: /* found - exit from recursion */
-            *saved_key= k - page_buf;
+            *saved_key= (uint) (k - page_buf);
             goto ok;
           case 1: /* not found - continue searching */
             info->maria_rtree_recursion_depth= level;
@@ -140,7 +140,7 @@ static int maria_rtree_find_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
         memcpy(info->last_key.data, k,
                info->last_key.data_length + info->last_key.ref_length);
         info->maria_rtree_recursion_depth= level;
-        *saved_key= last - page_buf;
+        *saved_key= (uint) (last - page_buf);
 
         if (after_key < last)
         {
@@ -366,7 +366,7 @@ static int maria_rtree_get_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
                                          _ma_kpos(nod_flag, k), level + 1)))
       {
         case 0: /* found - exit from recursion */
-          *saved_key= k - page.buff;
+          *saved_key= (uint) (k - page.buff);
           goto ok;
         case 1: /* not found - continue searching */
           info->maria_rtree_recursion_depth= level;
@@ -398,7 +398,7 @@ static int maria_rtree_get_req(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
              info->last_key.data_length + info->last_key.ref_length);
 
       info->maria_rtree_recursion_depth= level;
-      *saved_key= k - page.buff;
+      *saved_key= (uint) (k - page.buff);
 
       if (after_key < last)
       {
diff --git a/storage/maria/ma_rt_key.c b/storage/maria/ma_rt_key.c
index 488137ff159..500e484cf02 100644
--- a/storage/maria/ma_rt_key.c
+++ b/storage/maria/ma_rt_key.c
@@ -58,7 +58,7 @@ int maria_rtree_add_key(const MARIA_KEY *key, MARIA_PAGE *page,
     page->size+= tot_key_length;
     page_store_size(share, page);
     if (share->now_transactional &&
-        _ma_log_add(page, key_pos - page->buff,
+        _ma_log_add(page, (uint)(key_pos - page->buff),
                     key_pos, tot_key_length, tot_key_length, 0,
                     KEY_OP_DEBUG_LOG_ADD_1))
       DBUG_RETURN(-1);
diff --git a/storage/maria/ma_rt_split.c b/storage/maria/ma_rt_split.c
index 804cfe75558..898cb574f63 100644
--- a/storage/maria/ma_rt_split.c
+++ b/storage/maria/ma_rt_split.c
@@ -477,11 +477,11 @@ int maria_rtree_split_page(const MARIA_KEY *key, MARIA_PAGE *page,
       memcpy(to_with_nod_flag, cur_key_with_nod_flag, full_length);
       if (log_this_change)
       {
-        uint to_with_nod_flag_offs= to_with_nod_flag - page->buff;
+        size_t to_with_nod_flag_offs= to_with_nod_flag - page->buff;
         if (likely(cur_key != key->data))
         {
           /* this memcpy() is internal to the page (source in the page) */
-          uint cur_key_with_nod_flag_offs= cur_key_with_nod_flag - page->buff;
+          size_t cur_key_with_nod_flag_offs= cur_key_with_nod_flag - page->buff;
           int2store(log_internal_copy_ptr, to_with_nod_flag_offs);
           log_internal_copy_ptr+= 2;
           int2store(log_internal_copy_ptr, cur_key_with_nod_flag_offs);
@@ -526,8 +526,8 @@ int maria_rtree_split_page(const MARIA_KEY *key, MARIA_PAGE *page,
         ( /* log change to split page */
          _ma_log_rt_split(page, key->data - nod_flag,
                           full_length, log_internal_copy,
-                          log_internal_copy_ptr - log_internal_copy,
-                          log_key_copy, org_length - page->size) ||
+                          (uint)(log_internal_copy_ptr - log_internal_copy),
+                          log_key_copy, (uint)(org_length - page->size)) ||
          /* and to new page */
          _ma_log_new(&new_page, 0)))
       err_code= -1;
diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
index 87e422d0230..089e3fabdb2 100644
--- a/storage/maria/ma_search.c
+++ b/storage/maria/ma_search.c
@@ -1134,7 +1134,7 @@ uint _ma_get_pack_key(MARIA_KEY *int_key, uint page_flag,
     page+=length;
   }
 
-  int_key->data_length= (key - int_key->data);
+  int_key->data_length= (uint)(key - int_key->data);
   int_key->flag= 0;
   length= keyseg->length;
   if (page_flag & KEYPAGE_FLAG_HAS_TRANSID)
@@ -1336,7 +1336,7 @@ uint _ma_get_binary_pack_key(MARIA_KEY *int_key, uint page_flag, uint nod_flag,
     If we have mixed key blocks with data pointer and key block pointer,
     we have to copy both.
   */
-  int_key->data_length= (key - int_key->data);
+  int_key->data_length= (uint)(key - int_key->data);
   int_key->ref_length= length= keyseg->length;
   int_key->flag= 0;
   if ((tmp=(uint) (from_end-from)) <= length)
diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c
index 6e106976b70..024b72fff2e 100644
--- a/storage/maria/ma_sort.c
+++ b/storage/maria/ma_sort.c
@@ -500,10 +500,10 @@ static my_bool _ma_thr_find_all_keys_exec(MARIA_SORT_PARAM* sort_param)
                                (BUFFPEK *) alloc_dynamic(&sort_param->buffpek),
                                &sort_param->tempfile))
       goto err;
-    sort_param->keys= (sort_param->buffpek.elements - 1) * (keys - 1) + idx;
+    sort_param->keys= (uint)((sort_param->buffpek.elements - 1) * (keys - 1) + idx);
   }
   else
-    sort_param->keys= idx;
+    sort_param->keys= (uint)idx;
 
   DBUG_RETURN(FALSE);
 
@@ -627,7 +627,7 @@ int _ma_thr_write_keys(MARIA_SORT_PARAM *sort_param)
       uint maxbuffer=sinfo->buffpek.elements-1;
       if (!mergebuf)
       {
-        length=param->sort_buffer_length;
+        length=(size_t)param->sort_buffer_length;
         while (length >= MIN_SORT_MEMORY)
         {
           if ((mergebuf= my_malloc((size_t) length, MYF(0))))
@@ -919,13 +919,13 @@ static my_off_t read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
                                 uint sort_length)
 {
   register ha_keys count;
-  my_off_t length;
+  size_t length;
 
   if ((count= (ha_keys) MY_MIN((ha_rows) buffpek->max_keys,
                                (ha_rows) buffpek->count)))
   {
     if (my_b_pread(fromfile, (uchar*) buffpek->base,
-                   (length= sort_length * count), buffpek->file_pos))
+                   (length= sort_length * (size_t)count), buffpek->file_pos))
       return(HA_OFFSET_ERROR);               /* purecov: inspected */
     buffpek->key=buffpek->base;
     buffpek->file_pos+= length;                 /* New filepos */
diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c
index c4570922e08..2c24c125f36 100644
--- a/storage/maria/maria_read_log.c
+++ b/storage/maria/maria_read_log.c
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
     fprintf(stderr, "Can't find any log\n");
     goto err;
   }
-  if (init_pagecache(maria_pagecache, opt_page_buffer_size, 0, 0,
+  if (init_pagecache(maria_pagecache, (size_t)opt_page_buffer_size, 0, 0,
                      maria_block_size, 0, MY_WME) == 0)
   {
     fprintf(stderr, "Got error in init_pagecache() (errno: %d)\n", errno);
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 776fcb56570..69bc2f70f8c 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -485,7 +485,7 @@ int main(int argc __attribute__((unused)), char *argv[])
       fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
               "data read(0)\n"
               "type %u, strid %u, len %u, i: %u, 4: %u 5: %u, "
-              "lsn(0x%lu,0x%lx)\n",
+              LSN_FMT "\n",
               (uint) rec.type, (uint) rec.short_trid, (uint) rec.record_length,
               (uint)uint4korr(rec.header), (uint) rec.header[4],
               (uint) rec.header[5],
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 8fd2bf74ccb..917e142af91 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -3968,7 +3968,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a)
       key_block++;
     sort_info->key_block=key_block;
     sort_param->keyinfo=& sort_info->info->s->ft2_keyinfo;
-    ft_buf->count=((uchar*) ft_buf->buf - p)/val_len;
+    ft_buf->count=(int)((uchar*) ft_buf->buf - p)/val_len;
 
     /* flushing buffer to second-level tree */
     for (error=0; !error && p < (uchar*) ft_buf->buf; p+= val_len)
diff --git a/storage/myisam/mi_preload.c b/storage/myisam/mi_preload.c
index 1a2d5aac94f..5feb1c59ac3 100644
--- a/storage/myisam/mi_preload.c
+++ b/storage/myisam/mi_preload.c
@@ -41,7 +41,7 @@
 int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
 {
   uint i;
-  ulong length, block_length= 0;
+  size_t length, block_length= 0;
   uchar *buff= NULL;
   MYISAM_SHARE* share= info->s;
   uint keys= share->state.header.keys;
@@ -84,7 +84,7 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
   {
     /* Read the next block of index file into the preload buffer */
     if ((my_off_t) length > (key_file_length-pos))
-      length= (ulong) (key_file_length-pos);
+      length= (size_t) (key_file_length-pos);
     if (mysql_file_pread(share->kfile, (uchar*) buff, length, pos,
                          MYF(MY_FAE|MY_FNABP)))
       goto err;
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index c31ac8cd0d4..b4eef26f028 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -28,7 +28,7 @@
 static uint decode_bits;
 static char **default_argv;
 static const char *load_default_groups[]= { "myisamchk", 0 };
-static const char *set_collation_name, *opt_tmpdir;
+static char *set_collation_name, *opt_tmpdir;
 static CHARSET_INFO *set_collation;
 static long opt_myisam_block_size;
 static long opt_key_cache_block_size;
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 93b6e08eda8..7ff4b2e483b 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1684,7 +1684,7 @@ uint ha_myisammrg::count_query_cache_dependant_tables(uint8 *tables_type)
   (*tables_type)|= HA_CACHE_TBL_NONTRANSACT;
     but it has no effect because HA_CACHE_TBL_NONTRANSACT is 0
   */
-  return (file->end_table - file->open_tables);
+  return (uint)(file->end_table - file->open_tables);
 }
 
 
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index 3fd0e62ac44..d51908bdd66 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -1265,7 +1265,7 @@ static int build_prefix(const LEX_STRING *prefix, const char *category,
   out_ptr+= len;
   *out_ptr= '/';
   out_ptr++;
-  *output_length= out_ptr - output;
+  *output_length= (int)(out_ptr - output);
 
   return 0;
 }
@@ -1942,7 +1942,7 @@ static void set_thread_id_v1(PSI_thread *thread, ulonglong processlist_id)
   PFS_thread *pfs= reinterpret_cast<PFS_thread*> (thread);
   if (unlikely(pfs == NULL))
     return;
-  pfs->m_processlist_id= processlist_id;
+  pfs->m_processlist_id= (ulong)processlist_id;
 }
 
 /**
@@ -5121,7 +5121,7 @@ static void set_socket_info_v1(PSI_socket *socket,
 
   /** Set socket descriptor */
   if (fd != NULL)
-    pfs->m_fd= *fd;
+    pfs->m_fd= (uint)*fd;
 
   /** Set raw socket address and length */
   if (likely(addr != NULL && addr_len > 0))
diff --git a/storage/perfschema/pfs_account.cc b/storage/perfschema/pfs_account.cc
index 4e3a6d8d1d3..60467a764e3 100644
--- a/storage/perfschema/pfs_account.cc
+++ b/storage/perfschema/pfs_account.cc
@@ -202,7 +202,7 @@ static void set_account_key(PFS_account_key *key,
   }
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 }
 
 PFS_account *
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index 9e9ab02df46..547e5a3dfe3 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -1359,7 +1359,7 @@ bool pfs_show_status(handlerton *hton, THD *thd,
       break;
     }
 
-    buflen= longlong10_to_str(size, buf, 10) - buf;
+    buflen= (uint)(longlong10_to_str(size, buf, 10) - buf);
     if (print(thd,
               PERFORMANCE_SCHEMA_str.str, PERFORMANCE_SCHEMA_str.length,
               name, strlen(name),
diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
index 7da34a6d5f6..15db3e80a94 100644
--- a/storage/perfschema/pfs_host.cc
+++ b/storage/perfschema/pfs_host.cc
@@ -190,7 +190,7 @@ static void set_host_key(PFS_host_key *key,
   }
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 }
 
 PFS_host *find_or_create_host(PFS_thread *thread,
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
index a9ea6faf212..9cb2c68dbaf 100644
--- a/storage/perfschema/pfs_instr.cc
+++ b/storage/perfschema/pfs_instr.cc
@@ -952,7 +952,7 @@ PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
         pfs->m_thread_internal_id=
           PFS_atomic::add_u64(&thread_internal_id_counter, 1);
         pfs->m_parent_thread_internal_id= 0;
-        pfs->m_processlist_id= processlist_id;
+        pfs->m_processlist_id= (ulong)processlist_id;
         pfs->m_event_id= 1;
         pfs->m_stmt_lock.set_allocated();
         pfs->m_session_lock.set_allocated();
@@ -1604,7 +1604,7 @@ PFS_socket* create_socket(PFS_socket_class *klass, const my_socket *fd,
   uint addr_len_used= addr_len;
 
   if (fd != NULL)
-    fd_used= *fd;
+    fd_used= (int)*fd;
 
   if (addr_len_used > sizeof(sockaddr_storage))
     addr_len_used= sizeof(sockaddr_storage);
diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc
index c67c120283d..ed22c36f0d2 100644
--- a/storage/perfschema/pfs_instr_class.cc
+++ b/storage/perfschema/pfs_instr_class.cc
@@ -449,7 +449,7 @@ static void set_table_share_key(PFS_table_share_key *key,
   ptr+= table_name_length;
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 
   if (lower_case_table_names)
   {
diff --git a/storage/perfschema/pfs_setup_actor.cc b/storage/perfschema/pfs_setup_actor.cc
index f12d70840c1..40534d65da0 100644
--- a/storage/perfschema/pfs_setup_actor.cc
+++ b/storage/perfschema/pfs_setup_actor.cc
@@ -152,7 +152,7 @@ static void set_setup_actor_key(PFS_setup_actor_key *key,
   ptr+= role_length;
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 }
 
 int insert_setup_actor(const String *user, const String *host, const String *role)
diff --git a/storage/perfschema/pfs_setup_object.cc b/storage/perfschema/pfs_setup_object.cc
index 809fe8edd24..9fca9a6b945 100644
--- a/storage/perfschema/pfs_setup_object.cc
+++ b/storage/perfschema/pfs_setup_object.cc
@@ -145,7 +145,7 @@ static void set_setup_object_key(PFS_setup_object_key *key,
   ptr+= object_length;
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 }
 
 int insert_setup_object(enum_object_type object_type, const String *schema,
diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc
index 528457fe017..d2266e1f7ef 100644
--- a/storage/perfschema/pfs_user.cc
+++ b/storage/perfschema/pfs_user.cc
@@ -190,7 +190,7 @@ static void set_user_key(PFS_user_key *key,
   }
   ptr[0]= 0;
   ptr++;
-  key->m_key_length= ptr - &key->m_hash_key[0];
+  key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
 }
 
 PFS_user *
diff --git a/storage/perfschema/table_events_waits.cc b/storage/perfschema/table_events_waits.cc
index cd32d81519e..01f8cd5e6b5 100644
--- a/storage/perfschema/table_events_waits.cc
+++ b/storage/perfschema/table_events_waits.cc
@@ -279,7 +279,7 @@ int table_events_waits_common::make_socket_object_columns(volatile PFS_events_wa
                                    safe_socket->m_addr_len);
 
     /* Convert port number to a string (length includes ':') */
-    int port_len= int10_to_str(port, (port_str+1), 10) - port_str + 1;
+    int port_len= (int)(int10_to_str(port, (port_str+1), 10) - port_str + 1);
 
     /* OBJECT NAME */
     m_row.m_object_name_length= ip_length + port_len;
diff --git a/storage/rocksdb/rdb_sst_info.cc b/storage/rocksdb/rdb_sst_info.cc
index 8ca00bb30f5..72abfab5d6b 100644
--- a/storage/rocksdb/rdb_sst_info.cc
+++ b/storage/rocksdb/rdb_sst_info.cc
@@ -104,9 +104,11 @@ Rdb_sst_file_ordered::Rdb_sst_file::put(const rocksdb::Slice &key,
                                         const rocksdb::Slice &value) {
   DBUG_ASSERT(m_sst_file_writer != nullptr);
 
+#ifdef __GNUC__
   // Add the specified key/value to the sst file writer
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
   return m_sst_file_writer->Add(key, value);
 }
 
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 650bc93cf67..121cf41a3fe 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -1735,7 +1735,7 @@ bool CSphSEQuery::ParseField ( char * sField )
 		}
 	} else if ( !strcmp ( sName, "override" ) ) // name,type,id:value,id:value,...
 	{
-		char * sName = NULL;
+		sName = NULL;
 		int iType = 0;
 		CSphSEQuery::Override_t * pOverride = NULL;
 
@@ -1790,7 +1790,7 @@ bool CSphSEQuery::ParseField ( char * sField )
 			if (!( sRest = strchr ( sRest, ':' ) )) break; *sRest++ = '\0';
 			if (!( sRest - sId )) break;
 
-			char * sValue = sRest;
+			sValue = sRest;
 			if ( ( sRest = strchr ( sRest, ',' ) )!=NULL )
 				*sRest++ = '\0';
 			if ( !*sValue )
@@ -2209,7 +2209,7 @@ int ha_sphinx::Connect ( const char * sHost, ushort uPort )
 	}
 
 	char sError[512];
-	int iSocket = socket ( iDomain, SOCK_STREAM, 0 );
+	int iSocket = (int) socket ( iDomain, SOCK_STREAM, 0 );
 
 	if ( iSocket<0 )
 	{
@@ -2670,7 +2670,7 @@ bool ha_sphinx::UnpackStats ( CSphSEStats * pStats )
 	assert ( pStats );
 
 	char * pCurSave = m_pCur;
-	for ( uint i=0; i<m_iMatchesTotal && m_pCur<m_pResponseEnd-sizeof(uint32); i++ ) // NOLINT
+	for ( uint m=0; m<m_iMatchesTotal && m_pCur<m_pResponseEnd-sizeof(uint32); m++ ) // NOLINT
 	{
 		m_pCur += m_bId64 ? 12 : 8; // skip id+weight
 		for ( uint32 i=0; i<m_iAttrs && m_pCur<m_pResponseEnd-sizeof(uint32); i++ ) // NOLINT
@@ -3155,7 +3155,7 @@ int ha_sphinx::get_rec ( byte * buf, const byte *, uint )
 						}
 					}
 
-					af->store ( sBuf, pCur-sBuf, &my_charset_bin );
+					af->store ( sBuf, uint(pCur-sBuf), &my_charset_bin );
 				}
 				break;
 
@@ -3382,39 +3382,39 @@ ha_rows ha_sphinx::records_in_range ( uint, key_range *, key_range * )
 // currently provided for doing that.
 //
 // Called from handle.cc by ha_create_table().
-int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
+int ha_sphinx::create ( const char * name, TABLE * table_arg, HA_CREATE_INFO * )
 {
 	SPH_ENTER_METHOD();
 	char sError[256];
 
 	CSphSEShare tInfo;
-	if ( !ParseUrl ( &tInfo, table, true ) )
+	if ( !ParseUrl ( &tInfo, table_arg, true ) )
 		SPH_RET(-1);
 
 	// check SphinxAPI table
 	for ( ; !tInfo.m_bSphinxQL; )
 	{
 		// check system fields (count and types)
-		if ( table->s->fields<SPHINXSE_SYSTEM_COLUMNS )
+		if ( table_arg->s->fields<SPHINXSE_SYSTEM_COLUMNS )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: there MUST be at least %d columns",
 				name, SPHINXSE_SYSTEM_COLUMNS );
 			break;
 		}
 
-		if ( !IsIDField ( table->field[0] ) )
+		if ( !IsIDField ( table_arg->field[0] ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: 1st column (docid) MUST be unsigned integer or bigint", name );
 			break;
 		}
 
-		if ( !IsIntegerFieldType ( table->field[1]->type() ) )
+		if ( !IsIntegerFieldType ( table_arg->field[1]->type() ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: 2nd column (weight) MUST be integer or bigint", name );
 			break;
 		}
 
-		enum_field_types f2 = table->field[2]->type();
+		enum_field_types f2 = table_arg->field[2]->type();
 		if ( f2!=MYSQL_TYPE_VARCHAR
 			&& f2!=MYSQL_TYPE_BLOB && f2!=MYSQL_TYPE_MEDIUM_BLOB && f2!=MYSQL_TYPE_LONG_BLOB && f2!=MYSQL_TYPE_TINY_BLOB )
 		{
@@ -3424,28 +3424,28 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
 
 		// check attributes
 		int i;
-		for ( i=3; i<(int)table->s->fields; i++ )
+		for ( i=3; i<(int)table_arg->s->fields; i++ )
 		{
-			enum_field_types eType = table->field[i]->type();
+			enum_field_types eType = table_arg->field[i]->type();
 			if ( eType!=MYSQL_TYPE_TIMESTAMP && !IsIntegerFieldType(eType) && eType!=MYSQL_TYPE_VARCHAR && eType!=MYSQL_TYPE_FLOAT )
 			{
 				my_snprintf ( sError, sizeof(sError), "%s: %dth column (attribute %s) MUST be integer, bigint, timestamp, varchar, or float",
-					name, i+1, table->field[i]->field_name );
+					name, i+1, table_arg->field[i]->field_name );
 				break;
 			}
 		}
 
-		if ( i!=(int)table->s->fields )
+		if ( i!=(int)table_arg->s->fields )
 			break;
 
 		// check index
 		if (
-			table->s->keys!=1 ||
-			table->key_info[0].user_defined_key_parts!=1 ||
-			strcasecmp ( table->key_info[0].key_part[0].field->field_name, table->field[2]->field_name ) )
+			table_arg->s->keys!=1 ||
+			table_arg->key_info[0].user_defined_key_parts!=1 ||
+			strcasecmp ( table_arg->key_info[0].key_part[0].field->field_name, table_arg->field[2]->field_name ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: there must be an index on '%s' column",
-				name, table->field[2]->field_name );
+				name, table_arg->field[2]->field_name );
 			break;
 		}
 
@@ -3460,13 +3460,13 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
 		sError[0] = '\0';
 
 		// check that 1st column is id, is of int type, and has an index
-		if ( strcmp ( table->field[0]->field_name, "id" ) )
+		if ( strcmp ( table_arg->field[0]->field_name, "id" ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: 1st column must be called 'id'", name );
 			break;
 		}
 
-		if ( !IsIDField ( table->field[0] ) )
+		if ( !IsIDField ( table_arg->field[0] ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: 'id' column must be INT UNSIGNED or BIGINT", name );
 			break;
@@ -3474,22 +3474,22 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
 
 		// check index
 		if (
-			table->s->keys!=1 ||
-			table->key_info[0].user_defined_key_parts!=1 ||
-			strcasecmp ( table->key_info[0].key_part[0].field->field_name, "id" ) )
+			table_arg->s->keys!=1 ||
+			table_arg->key_info[0].user_defined_key_parts!=1 ||
+			strcasecmp ( table_arg->key_info[0].key_part[0].field->field_name, "id" ) )
 		{
 			my_snprintf ( sError, sizeof(sError), "%s: 'id' column must be indexed", name );
 			break;
 		}
 
 		// check column types
-		for ( int i=1; i<(int)table->s->fields; i++ )
+		for ( int i=1; i<(int)table_arg->s->fields; i++ )
 		{
-			enum_field_types eType = table->field[i]->type();
+			enum_field_types eType = table_arg->field[i]->type();
 			if ( eType!=MYSQL_TYPE_TIMESTAMP && !IsIntegerFieldType(eType) && eType!=MYSQL_TYPE_VARCHAR && eType!=MYSQL_TYPE_FLOAT )
 			{
 				my_snprintf ( sError, sizeof(sError), "%s: column %d(%s) is of unsupported type (use int/bigint/timestamp/varchar/float)",
-					name, i+1, table->field[i]->field_name );
+					name, i+1, table_arg->field[i]->field_name );
 				break;
 			}
 		}
@@ -3504,7 +3504,7 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * )
 	if ( sError[0] )
 	{
 		my_error ( ER_CANT_CREATE_TABLE, MYF(0),
-		table->s->db.str, table->s->table_name, sError );
+		table_arg->s->db.str, table_arg->s->table_name, sError );
 		SPH_RET(-1);
 	}
 
diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc
index 2a290bd8de9..1eab4b4ed3d 100644
--- a/storage/sphinx/snippets_udf.cc
+++ b/storage/sphinx/snippets_udf.cc
@@ -450,7 +450,7 @@ int CSphUrl::Connect()
 	char * pError = NULL;
 	do
 	{
-		iSocket = socket ( iDomain, SOCK_STREAM, 0 );
+		iSocket = (int)socket ( iDomain, SOCK_STREAM, 0 );
 		if ( iSocket==-1 )
 		{
 			pError = "Failed to create client socket";
@@ -642,7 +642,7 @@ struct CSphSnippets
 	}
 
 #define STRING CHECK_TYPE(STRING_RESULT)
-#define INT CHECK_TYPE(INT_RESULT); int iValue = *(long long *)pArgs->args[i]
+#define INT CHECK_TYPE(INT_RESULT); int iValue =(int)*(long long *)pArgs->args[i]
 
 my_bool sphinx_snippets_init ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sMessage )
 {
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index d6a5a20df8f..7363a69f49f 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -7793,7 +7793,7 @@ int ha_spider::cmp_ref(
       *field;
       field++
     ) {
-      if ((ret = (*field)->cmp_binary_offset(ptr_diff)))
+      if ((ret = (*field)->cmp_binary_offset((uint)ptr_diff)))
       {
         DBUG_PRINT("info",("spider different at %s", (*field)->field_name));
         break;
diff --git a/storage/spider/hs_client/config.cpp b/storage/spider/hs_client/config.cpp
index b546230ca03..3bf0f3e5bdf 100644
--- a/storage/spider/hs_client/config.cpp
+++ b/storage/spider/hs_client/config.cpp
@@ -263,8 +263,8 @@ parse_args(int argc, char **argv, config& conf)
     }
     if (!(param = new conf_param()))
       continue;
-    uint32 key_len = eq - arg;
-    uint32 val_len = strlen(eq + 1);
+    uint32 key_len = (uint32)(eq - arg);
+    uint32 val_len = (uint32)(strlen(eq + 1));
     if (
       param->key.reserve(key_len + 1) ||
       param->val.reserve(val_len + 1)
diff --git a/storage/spider/hs_client/hstcpcli.cpp b/storage/spider/hs_client/hstcpcli.cpp
index fed87803f9c..60da87b9f20 100644
--- a/storage/spider/hs_client/hstcpcli.cpp
+++ b/storage/spider/hs_client/hstcpcli.cpp
@@ -497,7 +497,7 @@ hstcpcli::response_recv(size_t& num_flds_r)
     char *const err_begin = start;
     read_token(start, finish);
     char *const err_end = start;
-    String e = String(err_begin, err_end - err_begin, &my_charset_bin);
+    String e = String(err_begin, (uint32)(err_end - err_begin), &my_charset_bin);
     if (!e.length()) {
       e = String("unknown_error", &my_charset_bin);
     }
diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp
index c61b39d140f..0717acf0da1 100644
--- a/storage/spider/hs_client/socket.cpp
+++ b/storage/spider/hs_client/socket.cpp
@@ -223,7 +223,7 @@ socket_set_options(auto_file& fd, const socket_args& args, String& err_r)
 int
 socket_open(auto_file& fd, const socket_args& args, String& err_r)
 {
-  fd.reset(socket(args.family, args.socktype, args.protocol));
+  fd.reset((int)socket(args.family, args.socktype, args.protocol));
   if (fd.get() < 0) {
     return errno_string("socket", errno, err_r);
   }
@@ -253,7 +253,7 @@ socket_connect(auto_file& fd, const socket_args& args, String& err_r)
 int
 socket_bind(auto_file& fd, const socket_args& args, String& err_r)
 {
-  fd.reset(socket(args.family, args.socktype, args.protocol));
+  fd.reset((int)socket(args.family, args.socktype, args.protocol));
   if (fd.get() < 0) {
     return errno_string("socket", errno, err_r);
   }
@@ -300,7 +300,7 @@ int
 socket_accept(int listen_fd, auto_file& fd, const socket_args& args,
   sockaddr_storage& addr_r, socklen_t& addrlen_r, String& err_r)
 {
-  fd.reset(accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
+  fd.reset((int)accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
     &addrlen_r));
   if (fd.get() < 0) {
     return errno_string("accept", errno, err_r);
diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc
index e1e81394ce8..09dbeff328e 100644
--- a/storage/spider/spd_sys_table.cc
+++ b/storage/spider/spd_sys_table.cc
@@ -677,13 +677,13 @@ void spider_store_tables_name(
   }
   table->field[0]->store(
     ptr_db,
-    ptr_diff_table - 1,
+    (uint)(ptr_diff_table - 1),
     system_charset_info);
   DBUG_PRINT("info",("spider field[0]->null_bit = %d",
     table->field[0]->null_bit));
   table->field[1]->store(
     ptr_table,
-    name_length - ptr_diff_db - ptr_diff_table,
+    (uint)(name_length - ptr_diff_db - ptr_diff_table),
     system_charset_info);
   DBUG_PRINT("info",("spider field[1]->null_bit = %d",
     table->field[1]->null_bit));