diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-15 15:10:36 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-16 09:45:38 +0000 |
| commit | 93087d5fe74b0078e0b6db4233710648c79043cc (patch) | |
| tree | a5c2aa20cb1135fbc086cb89a26e10981cf91f7b | |
| parent | 8c4df595b8bdd186ee68aee8a7953958fa503d3c (diff) | |
| download | mariadb-git-93087d5fe74b0078e0b6db4233710648c79043cc.tar.gz | |
Fix some warnings
| -rw-r--r-- | storage/innobase/include/ut0timer.ic | 2 | ||||
| -rw-r--r-- | storage/xtradb/btr/btr0cur.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/page0zip.ic | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/ut0timer.ic | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/include/ut0timer.ic b/storage/innobase/include/ut0timer.ic index 027e89c6279..46dcd0cb718 100644 --- a/storage/innobase/include/ut0timer.ic +++ b/storage/innobase/include/ut0timer.ic @@ -106,7 +106,7 @@ ut_microseconds_to_timer( /*=====================*/ ulonglong when) /*!< in: time where to calculate */ { - double ret = when; + double ret = (double)when; ret *= (double)(ut_timer.frequency); ret /= 1000000.0; return (ulonglong)ret; diff --git a/storage/xtradb/btr/btr0cur.cc b/storage/xtradb/btr/btr0cur.cc index 1a27fd0d6ea..59470b95c35 100644 --- a/storage/xtradb/btr/btr0cur.cc +++ b/storage/xtradb/btr/btr0cur.cc @@ -4379,7 +4379,7 @@ btr_estimate_number_of_different_key_vals( if (index->stat_index_size > 1) { n_sample_pages = (srv_stats_transient_sample_pages < index->stat_index_size) ? ut_min(index->stat_index_size, - log2(index->stat_index_size)*srv_stats_transient_sample_pages) + ulint(log2(index->stat_index_size)*srv_stats_transient_sample_pages)) : index->stat_index_size; } diff --git a/storage/xtradb/include/page0zip.ic b/storage/xtradb/include/page0zip.ic index bee35a48cc2..c6b155b73a0 100644 --- a/storage/xtradb/include/page0zip.ic +++ b/storage/xtradb/include/page0zip.ic @@ -174,7 +174,7 @@ page_zip_rec_needs_ext( ulint zip_size) /*!< in: compressed page size in bytes, or 0 */ { ut_ad(rec_size - > (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES)); + > ulint((comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES))); ut_ad(ut_is_2pow(zip_size)); ut_ad(comp || !zip_size); diff --git a/storage/xtradb/include/ut0timer.ic b/storage/xtradb/include/ut0timer.ic index 62e17a10fb1..815726e9d0a 100644 --- a/storage/xtradb/include/ut0timer.ic +++ b/storage/xtradb/include/ut0timer.ic @@ -106,7 +106,7 @@ ut_microseconds_to_timer( /*=====================*/ ulonglong when) /*!< in: time where to calculate */ { - double ret = when; + double ret = (double)when; ret *= (double)(ut_timer.frequency); ret /= 1000000.0; return (ulonglong)ret; |