into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug28250


sql/item_func.cc:
  Auto merged