Commit e056d1f1 authored by Marko Mäkelä's avatar Marko Mäkelä

Fix some InnoDB type mismatch

On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
parent e48ae21b
...@@ -5311,23 +5311,22 @@ buf_print_io_instance( ...@@ -5311,23 +5311,22 @@ buf_print_io_instance(
pool_info->pages_written_rate); pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) { if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta) double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta); / pool_info->n_page_get_delta;
if (hit_rate > 1000) { if (hit_rate > 1) {
hit_rate = 1000; hit_rate = 1;
} }
hit_rate = 1000 - hit_rate;
fprintf(file, fprintf(file,
"Buffer pool hit rate %lu / 1000," "Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n", " young-making rate " ULINTPF " / 1000 not "
(ulint) hit_rate, ULINTPF " / 1000\n",
(ulint) (1000 * pool_info->young_making_delta ulint(1000 * (1 - hit_rate)),
/ pool_info->n_page_get_delta), ulint(1000 * double(pool_info->young_making_delta)
(ulint) (1000 * pool_info->not_young_making_delta / pool_info->n_page_get_delta),
/ pool_info->n_page_get_delta)); ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else { } else {
fputs("No buffer pool page gets since the last printout\n", fputs("No buffer pool page gets since the last printout\n",
file); file);
......
...@@ -1248,10 +1248,9 @@ row_fts_build_sel_tree_level( ...@@ -1248,10 +1248,9 @@ row_fts_build_sel_tree_level(
int child_left; int child_left;
int child_right; int child_right;
ulint i; ulint i;
ulint num_item; ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1); start = num_item - 1;
num_item = static_cast<ulint>(1 << level);
for (i = 0; i < num_item; i++) { for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1]; child_left = sel_tree[(start + i) * 2 + 1];
...@@ -1320,7 +1319,7 @@ row_fts_build_sel_tree( ...@@ -1320,7 +1319,7 @@ row_fts_build_sel_tree(
treelevel++; treelevel++;
} }
start = (1 << treelevel) - 1; start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) { for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i; sel_tree[i + start] = i;
......
...@@ -5593,23 +5593,22 @@ buf_print_io_instance( ...@@ -5593,23 +5593,22 @@ buf_print_io_instance(
pool_info->pages_written_rate); pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) { if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta) double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta); / pool_info->n_page_get_delta;
if (hit_rate > 1000) { if (hit_rate > 1) {
hit_rate = 1000; hit_rate = 1;
} }
hit_rate = 1000 - hit_rate;
fprintf(file, fprintf(file,
"Buffer pool hit rate %lu / 1000," "Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n", " young-making rate " ULINTPF " / 1000 not "
(ulint) hit_rate, ULINTPF " / 1000\n",
(ulint) (1000 * pool_info->young_making_delta ulint(1000 * (1 - hit_rate)),
/ pool_info->n_page_get_delta), ulint(1000 * double(pool_info->young_making_delta)
(ulint) (1000 * pool_info->not_young_making_delta / pool_info->n_page_get_delta),
/ pool_info->n_page_get_delta)); ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else { } else {
fputs("No buffer pool page gets since the last printout\n", fputs("No buffer pool page gets since the last printout\n",
file); file);
......
...@@ -1251,10 +1251,9 @@ row_fts_build_sel_tree_level( ...@@ -1251,10 +1251,9 @@ row_fts_build_sel_tree_level(
int child_left; int child_left;
int child_right; int child_right;
ulint i; ulint i;
ulint num_item; ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1); start = num_item - 1;
num_item = static_cast<ulint>(1 << level);
for (i = 0; i < num_item; i++) { for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1]; child_left = sel_tree[(start + i) * 2 + 1];
...@@ -1323,7 +1322,7 @@ row_fts_build_sel_tree( ...@@ -1323,7 +1322,7 @@ row_fts_build_sel_tree(
treelevel++; treelevel++;
} }
start = (1 << treelevel) - 1; start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) { for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i; sel_tree[i + start] = i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment