summaryrefslogtreecommitdiff
path: root/storage/innobase/buf/buf0buf.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/buf/buf0buf.cc')
-rw-r--r--storage/innobase/buf/buf0buf.cc91
1 files changed, 46 insertions, 45 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index bcc23b877aa..b3eaf4bf5a9 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -637,7 +637,7 @@ buf_page_is_corrupted(
"InnoDB: " REFMAN
"forcing-innodb-recovery.html\n"
"InnoDB: for more information.\n",
- (ulong) mach_read_from_4(
+ (ulint) mach_read_from_4(
read_buf + FIL_PAGE_OFFSET),
(lsn_t) mach_read_from_8(
read_buf + FIL_PAGE_LSN),
@@ -828,7 +828,7 @@ buf_page_print(
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: Page dump in ascii and hex (%lu bytes):\n",
- (ulong) size);
+ size);
ut_print_buf(stderr, read_buf, size);
fputs("\nInnoDB: End of page dump\n", stderr);
}
@@ -2472,9 +2472,9 @@ buf_zip_decompress(
}
fprintf(stderr,
- "InnoDB: unable to decompress space %lu page %lu\n",
- (ulong) block->page.space,
- (ulong) block->page.offset);
+ "InnoDB: unable to decompress space %u page %u\n",
+ block->page.space,
+ block->page.offset);
return(FALSE);
case FIL_PAGE_TYPE_ALLOCATED:
@@ -3806,8 +3806,8 @@ buf_page_init(
fprintf(stderr,
"InnoDB: Error: page %lu %lu already found"
" in the hash table: %p, %p\n",
- (ulong) space,
- (ulong) offset,
+ space,
+ offset,
(const void*) hash_page, (const void*) block);
#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
mutex_exit(&block->mutex);
@@ -4170,7 +4170,7 @@ buf_page_create(
#ifdef UNIV_DEBUG
if (buf_debug_prints) {
fprintf(stderr, "Creating space %lu page %lu to buffer\n",
- (ulong) space, (ulong) offset);
+ space, offset);
}
#endif /* UNIV_DEBUG */
@@ -4571,10 +4571,10 @@ buf_page_io_complete(
ut_print_timestamp(stderr);
fprintf(stderr,
- " InnoDB: Error: reading page %lu\n"
+ " InnoDB: Error: reading page %u\n"
"InnoDB: which is in the"
" doublewrite buffer!\n",
- (ulong) bpage->offset);
+ bpage->offset);
} else if (!read_space_id && !read_page_no) {
/* This is likely an uninitialized page. */
} else if ((bpage->space
@@ -4590,10 +4590,11 @@ buf_page_io_complete(
" InnoDB: Error: space id and page n:o"
" stored in the page\n"
"InnoDB: read in are %lu:%lu,"
- " should be %lu:%lu!\n",
- (ulong) read_space_id, (ulong) read_page_no,
- (ulong) bpage->space,
- (ulong) bpage->offset);
+ " should be %u:%u!\n",
+ read_space_id,
+ read_page_no,
+ bpage->space,
+ bpage->offset);
}
/* From version 3.23.38 up we store the page checksum
@@ -4624,10 +4625,10 @@ corrupt:
"Database page corruption on disk"
" or a failed");
ib_logf(IB_LOG_LEVEL_ERROR,
- "Space %lu file %s read of page %lu.",
+ "Space %lu file %s read of page %u.",
(ulint)bpage->space,
space ? space->name : "NULL",
- (ulong) bpage->offset);
+ bpage->offset);
ib_logf(IB_LOG_LEVEL_ERROR,
"You may have to recover"
" from a backup.");
@@ -4803,8 +4804,8 @@ corrupt:
if (buf_debug_prints) {
fprintf(stderr, "Has %s page space %lu page no %lu\n",
io_type == BUF_IO_READ ? "read" : "written",
- (ulong) buf_page_get_space(bpage),
- (ulong) buf_page_get_page_no(bpage));
+ buf_page_get_space(bpage),
+ buf_page_get_page_no(bpage));
}
#endif /* UNIV_DEBUG */
@@ -4839,17 +4840,17 @@ buf_all_freed_instance(
if (block->page.key_version == 0) {
fil_space_t* space = fil_space_get(block->page.space);
ib_logf(IB_LOG_LEVEL_ERROR,
- "Page %lu %lu still fixed or dirty.",
- (ulong) block->page.space,
- (ulong) block->page.offset);
+ "Page %u %u still fixed or dirty.",
+ block->page.space,
+ block->page.offset);
ib_logf(IB_LOG_LEVEL_ERROR,
"Page oldest_modification %lu fix_count %d io_fix %d.",
block->page.oldest_modification,
block->page.buf_fix_count,
buf_page_get_io_fix(&block->page));
ib_logf(IB_LOG_LEVEL_ERROR,
- "Page space_id %lu name %s.",
- (ulong)block->page.space,
+ "Page space_id %u name %s.",
+ block->page.space,
(space && space->name) ? space->name : "NULL");
ut_error;
}
@@ -5151,16 +5152,16 @@ assert_s_latched:
if (n_lru + n_free > buf_pool->curr_size + n_zip) {
fprintf(stderr, "n LRU %lu, n free %lu, pool %lu zip %lu\n",
- (ulong) n_lru, (ulong) n_free,
- (ulong) buf_pool->curr_size, (ulong) n_zip);
+ n_lru, n_free,
+ buf_pool->curr_size, n_zip);
ut_error;
}
ut_a(UT_LIST_GET_LEN(buf_pool->LRU) == n_lru);
if (UT_LIST_GET_LEN(buf_pool->free) != n_free) {
fprintf(stderr, "Free list len %lu, free blocks %lu\n",
- (ulong) UT_LIST_GET_LEN(buf_pool->free),
- (ulong) n_free);
+ UT_LIST_GET_LEN(buf_pool->free),
+ n_free);
ut_error;
}
@@ -5239,20 +5240,20 @@ buf_print_instance(
"n pending flush LRU %lu list %lu single page %lu\n"
"pages made young %lu, not young %lu\n"
"pages read %lu, created %lu, written %lu\n",
- (ulong) size,
- (ulong) UT_LIST_GET_LEN(buf_pool->LRU),
- (ulong) UT_LIST_GET_LEN(buf_pool->free),
- (ulong) UT_LIST_GET_LEN(buf_pool->flush_list),
- (ulong) buf_pool->n_pend_unzip,
- (ulong) buf_pool->n_pend_reads,
- (ulong) buf_pool->n_flush[BUF_FLUSH_LRU],
- (ulong) buf_pool->n_flush[BUF_FLUSH_LIST],
- (ulong) buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE],
- (ulong) buf_pool->stat.n_pages_made_young,
- (ulong) buf_pool->stat.n_pages_not_made_young,
- (ulong) buf_pool->stat.n_pages_read,
- (ulong) buf_pool->stat.n_pages_created,
- (ulong) buf_pool->stat.n_pages_written);
+ (ulint) size,
+ (ulint) UT_LIST_GET_LEN(buf_pool->LRU),
+ (ulint) UT_LIST_GET_LEN(buf_pool->free),
+ (ulint) UT_LIST_GET_LEN(buf_pool->flush_list),
+ (ulint) buf_pool->n_pend_unzip,
+ (ulint) buf_pool->n_pend_reads,
+ (ulint) buf_pool->n_flush[BUF_FLUSH_LRU],
+ (ulint) buf_pool->n_flush[BUF_FLUSH_LIST],
+ (ulint) buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE],
+ (ulint) buf_pool->stat.n_pages_made_young,
+ (ulint) buf_pool->stat.n_pages_not_made_young,
+ (ulint) buf_pool->stat.n_pages_read,
+ (ulint) buf_pool->stat.n_pages_created,
+ (ulint) buf_pool->stat.n_pages_written);
buf_flush_list_mutex_exit(buf_pool);
@@ -5303,7 +5304,7 @@ buf_print_instance(
fprintf(stderr,
"Block count for index %llu in buffer is about %lu",
(ullint) index_ids[i],
- (ulong) counts[i]);
+ (ulint) counts[i]);
if (index) {
putc(' ', stderr);
@@ -5751,10 +5752,10 @@ buf_print_io_instance(
fprintf(file,
"Buffer pool hit rate %lu / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n",
- (ulong) hit_rate,
- (ulong) (1000 * pool_info->young_making_delta
+ (ulint) hit_rate,
+ (ulint) (1000 * pool_info->young_making_delta
/ pool_info->n_page_get_delta),
- (ulong) (1000 * pool_info->not_young_making_delta
+ (ulint) (1000 * pool_info->not_young_making_delta
/ pool_info->n_page_get_delta));
} else {
fputs("No buffer pool page gets since the last printout\n",
View Lorry Controller Status