Merge mysql.com:/home/hf/work/30638/my50-30638

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged