diff --git a/sql/log.cc b/sql/log.cc
index e3e944322f543..54b0766f6f493 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -13257,10 +13257,11 @@ bool Binlog_commit_by_rotate::replace_binlog_file()
   DBUG_EXECUTE_IF("simulate_required_size_too_big", required_size= 10000;);
   if (required_size > m_cache_data->file_reserved_bytes())
   {
-    sql_print_information("Could not rename binlog cache to binlog(as "
+    sql_print_information("Could not rename binlog cache to binlog (as "
                           "requested by --binlog-commit-by-rotate-threshold). "
-                          "Required %llu bytes but only %llu bytes reserved.",
-                          required_size, m_cache_data->file_reserved_bytes());
+                          "Required %zu bytes but only %lu bytes reserved.",
+                          required_size,
+                          (unsigned long) m_cache_data->file_reserved_bytes());
     return false;
   }
 
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc
index d6fa3d771af77..0e76dfd665811 100644
--- a/sql/semisync_master.cc
+++ b/sql/semisync_master.cc
@@ -939,7 +939,7 @@ int Repl_semi_sync_master::commit_trx(const char *trx_wait_binlog_name,
                 "Skipping semi-sync wait for transaction at pos %s, %lu. This "
                 "should be because semi-sync turned off and on during the "
                 "lifetime of this transaction.",
-                trx_wait_binlog_name, trx_wait_binlog_pos););
+                trx_wait_binlog_name, (unsigned long) trx_wait_binlog_pos););
 
         /* The only known reason for a missing entry at this point is if
          * semi-sync was turned off then on, so on debug builds, we track
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc
index bae862f1ce2a9..63cbc2babd74b 100644
--- a/storage/innobase/fsp/fsp0file.cc
+++ b/storage/innobase/fsp/fsp0file.cc
@@ -253,7 +253,7 @@ dberr_t Datafile::read_first_page_flags(const page_t *page) noexcept
     if (cflags == UINT32_MAX)
       switch (fsp_flags_is_incompatible_mysql(m_flags)) {
       case 0:
-        sql_print_error("InnoDB: Invalid flags 0x%zx in %s",
+        sql_print_error("InnoDB: Invalid flags 0x%" PRIx32 " in %s",
                         m_flags, m_filepath);
         return DB_CORRUPTION;
       case 3:
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 3db5086156996..3c24cdd152d21 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1619,8 +1619,8 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size,
 	if (is_sparse) {
 		bool success = !ftruncate(file, size);
 		if (!success) {
-			sql_print_error("InnoDB: ftruncate of file %s"
-					" to %llu bytes failed with error %d",
+			sql_print_error("InnoDB: ftruncate of file %s to %"
+					PRIu64 " bytes failed with error %d",
 					name, size, errno);
 		}
 		return success;
@@ -1658,7 +1658,7 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size,
 	case 0:
 		return true;
 	default:
-		sql_print_error("InnoDB: preallocating %llu"
+		sql_print_error("InnoDB: preallocating %" PRIu64
 				" bytes for file %s failed with error %d",
 				size, name, err);
 		/* fall through */
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 3d7fa3a1de94e..60dc57c84df03 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -3425,9 +3425,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	  {
 	    if (!searching)
 	      mi_check_print_info(param,
-				  "Found block with impossible length %u at %s; Skipped",
-				  block_info.block_len+ (uint) (block_info.filepos-pos),
-				  llstr(pos,llbuff));
+                "Found block with impossible length %lu at %s; Skipped",
+                block_info.block_len + (unsigned long) (block_info.filepos-pos),
+                llstr(pos, llbuff));
 	    if (found_record)
 	      goto try_next;
 	    searching=1;