diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index e6ff36f1307..6481d3f6f7d 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -11864,7 +11864,7 @@ get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
       if (cur_range->field->eq(cur_part->field))
         break;
     }
-    if (!cur_range)
+    if (!cur_range || cur_range->type != SEL_ARG::KEY_RANGE)
     {
       if (min_max_arg_part)
         return FALSE; /* The current keypart has no range predicates at all. */
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index be3def865a8..d04f5eddfa8 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -3871,7 +3871,8 @@ bool bka_skip_index_tuple(range_seq_t rseq, char *range_info)
 {
   DBUG_ENTER("bka_skip_index_tuple");
   JOIN_CACHE_BKA *cache= (JOIN_CACHE_BKA *) rseq;
-  DBUG_RETURN(cache->skip_index_tuple(range_info));
+  bool res= cache->skip_index_tuple(range_info);
+  DBUG_RETURN(res);
 }