Fix some printf format type mismatch

MariaDB · Jun 6, 2017 · 6e0e5ee · 6e0e5ee
1 parent 22fa9f2
commit 6e0e5ee
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc
@@ -394,7 +394,7 @@ buf_dump(
 				buf_dump_status(
 					STATUS_VERBOSE,
 					"Dumping buffer pool"
-					" " ULINTPF "/" ULINTPF ","
+					" " ULINTPF "/%lu,"
 					" page " ULINTPF "/" ULINTPF,
 					i + 1, srv_buf_pool_instances,
 					j + 1, n_pages);
@@ -595,8 +595,8 @@ buf_load()
 	if (dump == NULL) {
 		fclose(f);
 		buf_load_status(STATUS_ERR,
-				"Cannot allocate %lu bytes: %s",
-				(ulint) (dump_n * sizeof(*dump)),
+				"Cannot allocate " ULINTPF " bytes: %s",
+				dump_n * sizeof(*dump),
 				strerror(errno));
 		return;
 	}

diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc
@@ -773,11 +773,11 @@ buf_read_ahead_linear(
 	os_aio_simulated_wake_handler_threads();
 
 	if (count) {
-		DBUG_PRINT("ib_buf", ("linear read-ahead %lu pages, "
-				      "%lu:%lu",
+		DBUG_PRINT("ib_buf", ("linear read-ahead " ULINTPF " pages, "
+				      "%u:%u",
 				      count,
-				      (ulint)page_id.space(),
-				      (ulint)page_id.page_no()));
+				      page_id.space(),
+				      page_id.page_no()));
 	}
 
 	/* Read ahead is considered one I/O operation for the purpose of

diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
@@ -4366,7 +4366,7 @@ dict_table_get_highest_foreign_id(
 	}
 
 	DBUG_PRINT("dict_table_get_highest_foreign_id",
-		   ("id: %lu", biggest_id));
+		   ("id: " ULINTPF, biggest_id));
 
 	DBUG_RETURN(biggest_id);
 }
@@ -6611,7 +6611,8 @@ dict_table_schema_check(
 	if ((ulint) table->n_def - n_sys_cols != req_schema->n_cols) {
 		/* the table has a different number of columns than required */
 		ut_snprintf(errstr, errstr_sz,
-			    "%s has %lu columns but should have " ULINTPF ".",
+			    "%s has " ULINTPF " columns but should have "
+			    ULINTPF ".",
 			    ut_format_name(req_schema->table_name,
 					   buf, sizeof(buf)),
 			    table->n_def - n_sys_cols,

diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -7550,7 +7550,7 @@ AIO::to_file(FILE* file) const
 
 			fprintf(file,
 				"%s IO for %s (offset=" UINT64PF
-				", size=%lu)\n",
+				", size=" ULINTPF ")\n",
 				slot.type.is_read() ? "read" : "write",
 				slot.name, slot.offset, slot.len);
 		}

diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
@@ -417,7 +417,8 @@ que_graph_free_recursive(
 	}
 
 	DBUG_PRINT("que_graph_free_recursive",
-		   ("node: %p, type: %lu", node, que_node_get_type(node)));
+		   ("node: %p, type: " ULINTPF, node,
+		    que_node_get_type(node)));
 
 	switch (que_node_get_type(node)) {
 

diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
@@ -3225,7 +3225,7 @@ row_upd(
 	ut_ad(!thr_get_trx(thr)->in_rollback);
 
 	DBUG_PRINT("row_upd", ("table: %s", node->table->name.m_name));
-	DBUG_PRINT("row_upd", ("info bits in update vector: 0x%lx",
+	DBUG_PRINT("row_upd", ("info bits in update vector: 0x" ULINTPFx,
 			       node->update ? node->update->info_bits: 0));
 	DBUG_PRINT("row_upd", ("foreign_id: %s",
 			       node->foreign ? node->foreign->id: "NULL"));

diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
@@ -1187,14 +1187,14 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup)
     pagecache->blocks_changed= 0;
   }
 
-  DBUG_PRINT("status", ("used: %zu  changed: %zu  w_requests: %lu  "
-                        "writes: %lu  r_requests: %lu  reads: %lu",
-                        (ulong) pagecache->blocks_used,
-                        (ulong) pagecache->global_blocks_changed,
-                        (ulong) pagecache->global_cache_w_requests,
-                        (ulong) pagecache->global_cache_write,
-                        (ulong) pagecache->global_cache_r_requests,
-                        (ulong) pagecache->global_cache_read));
+  DBUG_PRINT("status", ("used: %zu  changed: %zu  w_requests: %llu  "
+                        "writes: %llu  r_requests: %llu  reads: %llu",
+			pagecache->blocks_used,
+			pagecache->global_blocks_changed,
+			pagecache->global_cache_w_requests,
+			pagecache->global_cache_write,
+			pagecache->global_cache_r_requests,
+			pagecache->global_cache_read));
 
   if (cleanup)
   {