into  linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942


sql/item_timefunc.h:
  Auto merged
mysql-test/r/type_date.result:
  Bug#30942: Manual merge
mysql-test/t/type_date.test:
  Bug#30942: Manual merge