into  pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490


sql/log.cc:
  Manual merge, the -5 hack is not needed anymore