after merge fix


sql/item.cc:
  after merge fix
sql/item_cmpfunc.cc:
  after review fix
sql/item_cmpfunc.h:
  after review fix