mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix some printf format type mismatch

Browse source
This commit is contained in:
Marko Mäkelä 2017-06-06 11:50:42 +03:00
commit 6e0e5eefbc
7 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/buf/buf0dump.cc
View file

@ -394,7 +394,7 @@ buf_dump(
buf_dump_status( buf_dump_status(
STATUS_VERBOSE, STATUS_VERBOSE,
"Dumping buffer pool" "Dumping buffer pool"
" " ULINTPF "/" ULINTPF "," " " ULINTPF "/%lu,"
" page " ULINTPF "/" ULINTPF, " page " ULINTPF "/" ULINTPF,
i + 1, srv_buf_pool_instances, i + 1, srv_buf_pool_instances,
j + 1, n_pages); j + 1, n_pages);
@ -595,8 +595,8 @@ buf_load()
if (dump == NULL) { if (dump == NULL) {
fclose(f); fclose(f);
buf_load_status(STATUS_ERR, buf_load_status(STATUS_ERR,
"Cannot allocate %lu bytes: %s", "Cannot allocate " ULINTPF " bytes: %s",
(ulint) (dump_n * sizeof(*dump)), dump_n * sizeof(*dump),
strerror(errno)); strerror(errno));
return; return;
} }

8
storage/innobase/buf/buf0rea.cc
View file

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

5
storage/innobase/dict/dict0dict.cc
View file

@ -4366,7 +4366,7 @@ dict_table_get_highest_foreign_id(
} }
DBUG_PRINT("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); DBUG_RETURN(biggest_id);
} }
@ -6611,7 +6611,8 @@ dict_table_schema_check(
if ((ulint) table->n_def - n_sys_cols != req_schema->n_cols) { if ((ulint) table->n_def - n_sys_cols != req_schema->n_cols) {
/* the table has a different number of columns than required */ /* the table has a different number of columns than required */
ut_snprintf(errstr, errstr_sz, 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, ut_format_name(req_schema->table_name,
buf, sizeof(buf)), buf, sizeof(buf)),
table->n_def - n_sys_cols, table->n_def - n_sys_cols,

2
storage/innobase/os/os0file.cc
View file

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

3
storage/innobase/que/que0que.cc
View file

@ -417,7 +417,8 @@ que_graph_free_recursive(
} }
DBUG_PRINT("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)) { switch (que_node_get_type(node)) {

2
storage/innobase/row/row0upd.cc
View file

@ -3225,7 +3225,7 @@ row_upd(
ut_ad(!thr_get_trx(thr)->in_rollback); ut_ad(!thr_get_trx(thr)->in_rollback);
DBUG_PRINT("row_upd", ("table: %s", node->table->name.m_name)); 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)); node->update ? node->update->info_bits: 0));
DBUG_PRINT("row_upd", ("foreign_id: %s", DBUG_PRINT("row_upd", ("foreign_id: %s",
node->foreign ? node->foreign->id: "NULL")); node->foreign ? node->foreign->id: "NULL"));

16
storage/maria/ma_pagecache.c
View file

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