mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up after commit 93087d5fe7

Browse source 
Apply the same changes to both InnoDB and XtraDB.
This commit is contained in:
Marko Mäkelä 2017-09-16 15:05:22 +03:00
parent 1d7bc3b582
commit 75dd3bcb4c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/btr/btr0cur.cc
View file

@ -4106,7 +4106,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;
}

2
storage/innobase/include/page0zip.ic
View file

@ -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);

2
storage/xtradb/include/page0zip.ic
View file

@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{
ut_ad(rec_size
> ulint((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);