summaryrefslogtreecommitdiff
path: root/innobase/btr/btr0sea.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-20 03:41:04 +0200
committermonty@mysql.com <>2003-12-20 03:41:04 +0200
commit0448a3f4c01fdbc1d3ae0c26dddba7874b652394 (patch)
tree7b73c477120c02f912fc4e2d5105e727385d6bc6 /innobase/btr/btr0sea.c
parent4b3e443b3637446ef5933fd705e92a1d198c6568 (diff)
downloadmariadb-git-0448a3f4c01fdbc1d3ae0c26dddba7874b652394.tar.gz
Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
A after merge fix for last merge
Diffstat (limited to 'innobase/btr/btr0sea.c')
-rw-r--r--innobase/btr/btr0sea.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
index e49ee15f5ea..207ebcfb641 100644
--- a/innobase/btr/btr0sea.c
+++ b/innobase/btr/btr0sea.c
@@ -1532,11 +1532,11 @@ btr_search_index_print_info(
info = btr_search_get_info(index);
printf("Searches %lu, hash succ %lu, fail %lu, patt succ %lu\n",
- info->n_searches, info->n_hash_succ, info->n_hash_fail,
- info->n_patt_succ);
+ (ulong) info->n_searches, (ulong) info->n_hash_succ,
+ (ulong) info->n_hash_fail, (ulong) info->n_patt_succ);
printf("Total of page cur short succ for all indexes %lu\n",
- page_cur_short_succ);
+ (ulong) page_cur_short_succ);
rw_lock_x_unlock(&btr_search_latch);
}
@@ -1604,11 +1604,12 @@ btr_search_validate(void)
fprintf(stderr,
" InnoDB: Error in an adaptive hash index pointer to page %lu\n"
"ptr mem address %lu index id %lu %lu, node fold %lu, rec fold %lu\n",
- buf_frame_get_page_no(page),
- (ulint)(node->data),
- ut_dulint_get_high(btr_page_get_index_id(page)),
- ut_dulint_get_low(btr_page_get_index_id(page)),
- node->fold, rec_fold((rec_t*)(node->data),
+ (ulong) buf_frame_get_page_no(page),
+ (ulong)(node->data),
+ (ulong) ut_dulint_get_high(btr_page_get_index_id(page)),
+ (ulong) ut_dulint_get_low(btr_page_get_index_id(page)),
+ (ulong) node->fold,
+ (ulong) rec_fold((rec_t*)(node->data),
block->curr_n_fields,
block->curr_n_bytes,
btr_page_get_index_id(page)));
@@ -1622,8 +1623,9 @@ btr_search_validate(void)
fprintf(stderr,
"Page mem address %lu, is hashed %lu, n fields %lu, n bytes %lu\n"
"side %lu\n",
- (ulint)page, block->is_hashed, block->curr_n_fields,
- block->curr_n_bytes, block->curr_side);
+ (ulong) page, (ulong) block->is_hashed,
+ (ulong) block->curr_n_fields,
+ (ulong) block->curr_n_bytes, (ulong) block->curr_side);
if (n_page_dumps < 20) {
buf_page_print(page);