After merge fixes.


sql/item.cc:
  After merge fixes.
sql/opt_range.cc:
  After merge fixes.
sql/sql_select.cc:
  After merge fixes.