Commit 75dd3bcb authored by Marko Mäkelä's avatar Marko Mäkelä

Clean up after commit 93087d5f

Apply the same changes to both InnoDB and XtraDB.
parent 1d7bc3b5
...@@ -4106,7 +4106,7 @@ btr_estimate_number_of_different_key_vals( ...@@ -4106,7 +4106,7 @@ btr_estimate_number_of_different_key_vals(
if (index->stat_index_size > 1) { if (index->stat_index_size > 1) {
n_sample_pages = (srv_stats_transient_sample_pages < index->stat_index_size) ? n_sample_pages = (srv_stats_transient_sample_pages < index->stat_index_size) ?
ut_min(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; : index->stat_index_size;
} }
......
...@@ -174,7 +174,7 @@ page_zip_rec_needs_ext( ...@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */ ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{ {
ut_ad(rec_size 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(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size); ut_ad(comp || !zip_size);
......
...@@ -174,7 +174,7 @@ page_zip_rec_needs_ext( ...@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */ ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{ {
ut_ad(rec_size 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(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size); ut_ad(comp || !zip_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment