into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged