1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c04eda05c57..414cab6f511 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -29478,13 +29478,8 @@ void unpack_to_base_table_fields(TABLE *table)
 
 bool is_range_predicate(Item *item, Item *value)
 {
-  /*
-    calling real_item() here so that if the item is a REF_ITEM
-    then we would get the item field it is referring to
-  */
-  Item *field= item->real_item();
-  if (field->type() == Item::FIELD_ITEM && !field->const_item() &&
-      (!value || !value->is_expensive()))
+  if (item->is_non_const_field_item() &&
+     (value->const_item() && !value->is_expensive()))
     return true;
   return false;
 }