diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 012f23b3b8d..c6106d47557 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1641,8 +1641,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;
@@ -1680,7 +1680,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 e46dc35f861..dff5fcdbcb6 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -3429,9 +3429,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;