diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-10 20:05:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-11 08:29:48 +0200 |
| commit | 574d8b29402f9826f73eeb54a3b9cc406268710c (patch) | |
| tree | 561112cee04b8fe28b1bdb153bc2e24dddf8b545 /storage/innobase/btr/btr0defragment.cc | |
| parent | 6ec3682371116f58c88e3affa4f9e129aaa44fcf (diff) | |
| download | mariadb-git-574d8b29402f9826f73eeb54a3b9cc406268710c.tar.gz | |
MDEV-21907: Fix most clang -Wconversion in InnoDB
Declare innodb_purge_threads as 4-byte integer (UINT)
instead of 4-or-8-byte (ULONG) and adjust the documentation string.
Diffstat (limited to 'storage/innobase/btr/btr0defragment.cc')
| -rw-r--r-- | storage/innobase/btr/btr0defragment.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc index aa3c33893c6..5348e9a6b27 100644 --- a/storage/innobase/btr/btr0defragment.cc +++ b/storage/innobase/btr/btr0defragment.cc @@ -666,8 +666,9 @@ btr_defragment_n_pages( max_data_size = optimal_page_size; } - reserved_space = ut_min((ulint)(optimal_page_size - * (1 - srv_defragment_fill_factor)), + reserved_space = ut_min(static_cast<ulint>( + static_cast<double>(optimal_page_size) + * (1 - srv_defragment_fill_factor)), (data_size_per_rec * srv_defragment_fill_factor_n_recs)); optimal_page_size -= reserved_space; |