diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c63ddca14ce..58c19422b24 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2626,11 +2626,7 @@ add_key_field(KEY_FIELD **key_fields, uint and_level, COND *cond,
 
       bool is_const=1;
       for (uint i=0; i<num_values; i++)
-        /*
-          TODO: This looks like a bug. It should be
-          is_const&= (value[i])->const_item();
-        */
-        is_const&= (*value)->const_item();
+        is_const&= (value[i])->const_item();
       if (is_const)
         stat[0].const_keys.merge(possible_keys);
       /*