diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-09 11:28:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-09 11:28:07 +0200 |
| commit | 1b2b209519c1ffd03ec2a1639d64d994e5d9090d (patch) | |
| tree | f163a1b5ef7ca4d4c385bde179298e6e405cd217 /storage/maria | |
| parent | 8805fe0d5c51925c3649cb7ea2df84944370852e (diff) | |
| download | mariadb-git-1b2b209519c1ffd03ec2a1639d64d994e5d9090d.tar.gz | |
Use correct integer format with printf-like functions.
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_pagecache.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c index d3eb687d064..50439785eca 100644 --- a/storage/maria/ma_pagecache.c +++ b/storage/maria/ma_pagecache.c @@ -883,8 +883,8 @@ size_t init_pagecache(PAGECACHE *pagecache, size_t use_mem, pagecache->waiting_for_hash_link.last_thread= NULL; pagecache->waiting_for_block.last_thread= NULL; DBUG_PRINT("exit", - ("disk_blocks: %ld block_root: 0x%lx hash_entries: %ld\ - hash_root: 0x%lx hash_links: %ld hash_link_root: 0x%lx", + ("disk_blocks: %zu block_root: 0x%lx hash_entries: %zu\ + hash_root: 0x%lx hash_links: %zu hash_link_root: 0x%lx", pagecache->disk_blocks, (long) pagecache->block_root, pagecache->hash_entries, (long) pagecache->hash_root, pagecache->hash_links, (long) pagecache->hash_link_root)); @@ -1182,7 +1182,7 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup) pagecache->blocks_changed= 0; } - DBUG_PRINT("status", ("used: %lu changed: %lu w_requests: %lu " + DBUG_PRINT("status", ("used: %zu changed: %zu w_requests: %lu " "writes: %lu r_requests: %lu reads: %lu", pagecache->blocks_used, pagecache->global_blocks_changed, @@ -1517,7 +1517,7 @@ static void unreg_request(PAGECACHE *pagecache, if (block->temperature == PCBLOCK_WARM) pagecache->warm_blocks--; block->temperature= PCBLOCK_HOT; - KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu", + KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu", pagecache->warm_blocks)); } link_block(pagecache, block, hot, (my_bool)at_end); @@ -1536,7 +1536,7 @@ static void unreg_request(PAGECACHE *pagecache, pagecache->warm_blocks++; block->temperature= PCBLOCK_WARM; } - KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu", + KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu", pagecache->warm_blocks)); } } @@ -4491,7 +4491,7 @@ static int flush_pagecache_blocks_int(PAGECACHE *pagecache, int rc= PCFLUSH_OK; DBUG_ENTER("flush_pagecache_blocks_int"); DBUG_PRINT("enter", - ("fd: %d blocks_used: %lu blocks_changed: %lu type: %d", + ("fd: %d blocks_used: %zu blocks_changed: %zu type: %d", file->file, pagecache->blocks_used, pagecache->blocks_changed, type)); @@ -4956,7 +4956,7 @@ my_bool pagecache_collect_changed_blocks_with_lsn(PAGECACHE *pagecache, ptr= str->str; int8store(ptr, (ulonglong)stored_list_size); ptr+= 8; - DBUG_PRINT("info", ("found %lu dirty pages", stored_list_size)); + DBUG_PRINT("info", ("found %zu dirty pages", stored_list_size)); if (stored_list_size == 0) goto end; for (file_hash= 0; file_hash < pagecache->changed_blocks_hash_size; file_hash++) |