diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 08:45:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 18:04:02 +0300 |
| commit | 47141c9d9b5170bb8e6a401f4456a4d759688fe3 (patch) | |
| tree | d01797ed9c169f15a3545c9a846e383c25c746cb /storage/innobase/row/row0ftsort.cc | |
| parent | 5684aa220cc4415fe8ee31ac044210b9ff8c7ce1 (diff) | |
| download | mariadb-git-47141c9d9b5170bb8e6a401f4456a4d759688fe3.tar.gz | |
Fix some InnoDB type mismatch
On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 9aca879fa1a..2adf32b79d9 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1480,10 +1480,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]; @@ -1552,7 +1551,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; |