1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some InnoDB type mismatch

Browse Source 
On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
This commit is contained in:
Marko Mäkelä 2017-04-21 17:39:12 +03:00
parent e48ae21b0e
commit e056d1f1ca
4 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
storage/innobase/buf/buf0buf.cc
View File

@ -5311,23 +5311,22 @@ buf_print_io_instance(
pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta)
/ pool_info->n_page_get_delta);
double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta;
if (hit_rate > 1000) {
hit_rate = 1000;
if (hit_rate > 1) {
hit_rate = 1;
}
hit_rate = 1000 - hit_rate;
fprintf(file,
"Buffer pool hit rate %lu / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n",
(ulint) hit_rate,
(ulint) (1000 * pool_info->young_making_delta
/ pool_info->n_page_get_delta),
(ulint) (1000 * pool_info->not_young_making_delta
/ pool_info->n_page_get_delta));
"Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate " ULINTPF " / 1000 not "
ULINTPF " / 1000\n",
ulint(1000 * (1 - hit_rate)),
ulint(1000 * double(pool_info->young_making_delta)
/ pool_info->n_page_get_delta),
ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else {
fputs("No buffer pool page gets since the last printout\n",
file);

7
storage/innobase/row/row0ftsort.cc
View File

@ -1248,10 +1248,9 @@ row_fts_build_sel_tree_level(
int child_left;
int child_right;
ulint i;
ulint num_item;
ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1);
num_item = static_cast<ulint>(1 << level);
start = num_item - 1;
for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1];
@ -1320,7 +1319,7 @@ row_fts_build_sel_tree(
treelevel++;
}
start = (1 << treelevel) - 1;
start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i;

25
storage/xtradb/buf/buf0buf.cc
View File

@ -5593,23 +5593,22 @@ buf_print_io_instance(
pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta)
/ pool_info->n_page_get_delta);
double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta;
if (hit_rate > 1000) {
hit_rate = 1000;
if (hit_rate > 1) {
hit_rate = 1;
}
hit_rate = 1000 - hit_rate;
fprintf(file,
"Buffer pool hit rate %lu / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n",
(ulint) hit_rate,
(ulint) (1000 * pool_info->young_making_delta
/ pool_info->n_page_get_delta),
(ulint) (1000 * pool_info->not_young_making_delta
/ pool_info->n_page_get_delta));
"Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate " ULINTPF " / 1000 not "
ULINTPF " / 1000\n",
ulint(1000 * (1 - hit_rate)),
ulint(1000 * double(pool_info->young_making_delta)
/ pool_info->n_page_get_delta),
ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else {
fputs("No buffer pool page gets since the last printout\n",
file);

7
storage/xtradb/row/row0ftsort.cc
View File

@ -1251,10 +1251,9 @@ row_fts_build_sel_tree_level(
int child_left;
int child_right;
ulint i;
ulint num_item;
ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1);
num_item = static_cast<ulint>(1 << level);
start = num_item - 1;
for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1];
@ -1323,7 +1322,7 @@ row_fts_build_sel_tree(
treelevel++;
}
start = (1 << treelevel) - 1;
start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i;