Skip to content

Commit 1b2b209

Browse files
committed
Use correct integer format with printf-like functions.
1 parent 8805fe0 commit 1b2b209

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

storage/innobase/buf/buf0buf.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4415,7 +4415,8 @@ buf_all_freed_instance(
44154415
block->page.space,
44164416
block->page.offset);
44174417
ib_logf(IB_LOG_LEVEL_ERROR,
4418-
"Page oldest_modification %lu fix_count %d io_fix %d.",
4418+
"Page oldest_modification " LSN_PF
4419+
" fix_count %d io_fix %d.",
44194420
block->page.oldest_modification,
44204421
block->page.buf_fix_count,
44214422
buf_page_get_io_fix(&block->page));

storage/maria/ma_pagecache.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -883,8 +883,8 @@ size_t init_pagecache(PAGECACHE *pagecache, size_t use_mem,
883883
pagecache->waiting_for_hash_link.last_thread= NULL;
884884
pagecache->waiting_for_block.last_thread= NULL;
885885
DBUG_PRINT("exit",
886-
("disk_blocks: %ld block_root: 0x%lx hash_entries: %ld\
887-
hash_root: 0x%lx hash_links: %ld hash_link_root: 0x%lx",
886+
("disk_blocks: %zu block_root: 0x%lx hash_entries: %zu\
887+
hash_root: 0x%lx hash_links: %zu hash_link_root: 0x%lx",
888888
pagecache->disk_blocks, (long) pagecache->block_root,
889889
pagecache->hash_entries, (long) pagecache->hash_root,
890890
pagecache->hash_links, (long) pagecache->hash_link_root));
@@ -1182,7 +1182,7 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup)
11821182
pagecache->blocks_changed= 0;
11831183
}
11841184

1185-
DBUG_PRINT("status", ("used: %lu changed: %lu w_requests: %lu "
1185+
DBUG_PRINT("status", ("used: %zu changed: %zu w_requests: %lu "
11861186
"writes: %lu r_requests: %lu reads: %lu",
11871187
pagecache->blocks_used,
11881188
pagecache->global_blocks_changed,
@@ -1517,7 +1517,7 @@ static void unreg_request(PAGECACHE *pagecache,
15171517
if (block->temperature == PCBLOCK_WARM)
15181518
pagecache->warm_blocks--;
15191519
block->temperature= PCBLOCK_HOT;
1520-
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu",
1520+
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu",
15211521
pagecache->warm_blocks));
15221522
}
15231523
link_block(pagecache, block, hot, (my_bool)at_end);
@@ -1536,7 +1536,7 @@ static void unreg_request(PAGECACHE *pagecache,
15361536
pagecache->warm_blocks++;
15371537
block->temperature= PCBLOCK_WARM;
15381538
}
1539-
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu",
1539+
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu",
15401540
pagecache->warm_blocks));
15411541
}
15421542
}
@@ -4491,7 +4491,7 @@ static int flush_pagecache_blocks_int(PAGECACHE *pagecache,
44914491
int rc= PCFLUSH_OK;
44924492
DBUG_ENTER("flush_pagecache_blocks_int");
44934493
DBUG_PRINT("enter",
4494-
("fd: %d blocks_used: %lu blocks_changed: %lu type: %d",
4494+
("fd: %d blocks_used: %zu blocks_changed: %zu type: %d",
44954495
file->file, pagecache->blocks_used, pagecache->blocks_changed,
44964496
type));
44974497

@@ -4956,7 +4956,7 @@ my_bool pagecache_collect_changed_blocks_with_lsn(PAGECACHE *pagecache,
49564956
ptr= str->str;
49574957
int8store(ptr, (ulonglong)stored_list_size);
49584958
ptr+= 8;
4959-
DBUG_PRINT("info", ("found %lu dirty pages", stored_list_size));
4959+
DBUG_PRINT("info", ("found %zu dirty pages", stored_list_size));
49604960
if (stored_list_size == 0)
49614961
goto end;
49624962
for (file_hash= 0; file_hash < pagecache->changed_blocks_hash_size; file_hash++)

storage/xtradb/buf/buf0buf.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4694,7 +4694,8 @@ buf_all_freed_instance(
46944694
block->page.space,
46954695
block->page.offset);
46964696
ib_logf(IB_LOG_LEVEL_ERROR,
4697-
"Page oldest_modification %lu fix_count %d io_fix %d.",
4697+
"Page oldest_modification " LSN_PF
4698+
" fix_count %d io_fix %d.",
46984699
block->page.oldest_modification,
46994700
block->page.buf_fix_count,
47004701
buf_page_get_io_fix(&block->page));

0 commit comments

Comments
 (0)