manual adding the fix for bug#15828 which did not automerge


sql/item_timefunc.cc:
  manual adding the fix for bug#15828 which did not automerge