Clean up after commit 93087d5f

Apply the same changes to both InnoDB and XtraDB.

storage/innobase/btr/btr0cur.cc

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

storage/innobase/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);
 

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