diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-24 11:03:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 22:45:53 +0300 |
| commit | acea8b5bad527c699ec3a9d249465989f5f2c0e6 (patch) | |
| tree | 70563a6a786b9444d860c27d7128a4c062034050 /extra | |
| parent | 3b68515bf2f6bcb74def8dfcef191dc0e612420f (diff) | |
| download | mariadb-git-acea8b5bad527c699ec3a9d249465989f5f2c0e6.tar.gz | |
Fix some integer type mismatch in innochecksum
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index 238a5a80ac5..fe828026b4b 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -82,7 +82,7 @@ uintmax_t cur_page_num; /* Skip the checksum verification. */ static bool no_check; /* Enabled for strict checksum verification. */ -bool strict_verify = 0; +bool strict_verify; /* Enabled for rewrite checksum. */ static bool do_write; /* Mismatches count allowed (0 by default). */ @@ -280,7 +280,8 @@ void print_index_leaf_stats( fprintf(fil_out, "page_no\tdata_size\tn_recs\n"); while (it_page != index.leaves.end()) { const per_page_stats& stat = it_page->second; - fprintf(fil_out, "%llu\t%lu\t%lu\n", it_page->first, stat.data_size, stat.n_recs); + fprintf(fil_out, "%llu\t" ULINTPF "\t" ULINTPF "\n", + it_page->first, stat.data_size, stat.n_recs); page_no = stat.right_page_no; it_page = index.leaves.find(page_no); } @@ -315,12 +316,15 @@ void defrag_analysis( } if (index.leaf_pages) { - fprintf(fil_out, "count = %lu free = %lu\n", index.count, index.free_pages); + fprintf(fil_out, "count = " ULINTPF " free = " ULINTPF "\n", + index.count, index.free_pages); } - fprintf(fil_out, "%llu\t\t%llu\t\t%lu\t\t%lu\t\t%lu\t\t%.2f\t%lu\n", + fprintf(fil_out, "%llu\t\t%llu\t\t" + ULINTPF "\t\t%lu\t\t" ULINTPF "\t\t%.2f\t" ULINTPF "\n", id, index.leaf_pages, n_leaf_pages, n_merge, n_pages, - 1.0 - (double)n_pages / (double)n_leaf_pages, index.max_data_size); + 1.0 - (double)n_pages / (double)n_leaf_pages, + index.max_data_size); } void print_leaf_stats( |