diff --git a/sql/opt_split.cc b/sql/opt_split.cc
index 8c67cc94a60..4d71e9cdd1b 100644
--- a/sql/opt_split.cc
+++ b/sql/opt_split.cc
@@ -874,7 +874,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count,
   */
   for (uint tablenr= 0; tablenr < join->table_count; tablenr++)
   {
-    if (!((1 << tablenr) & tables_usable_for_splitting))
+    if (!((1ULL << tablenr) & tables_usable_for_splitting))
       continue;
     JOIN_TAB *tab= join->map2table[tablenr];
     TABLE *table= tab->table;
@@ -978,7 +978,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count,
   }
 
   /* Set the cost of the preferred materialization for this partial join */
-  records= spl_opt_info->unsplit_card;
+  records= (ha_rows)spl_opt_info->unsplit_card;
   spl_plan= spl_opt_info->last_plan;
   if (spl_plan)
   {
diff --git a/strings/dtoa.c b/strings/dtoa.c
index eccd05bcf92..7b560227026 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.c
@@ -1290,7 +1290,7 @@ static double ratio(Bigint *a, Bigint *b)
   dval(&db)= b2d(b, &kb);
   k= ka - kb + 32*(a->wds - b->wds);
   if (k > 0)
-    word0(&da)+= k*Exp_msk1 * 1.0;
+    word0(&da)+= (ULong)(k*Exp_msk1 * 1.0);
   else
   {
     k= -k;