• unknown's avatar
    Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree. · dc09d7f3
    unknown authored
    
    mysql-test/r/func_time.result:
      Manual merge.
    mysql-test/r/type_datetime.result:
      Manual merge.
    mysql-test/t/func_time.test:
      Manual merge.
    mysql-test/t/type_datetime.test:
      Manual merge.
    sql/item_timefunc.cc:
      Manual merge.
    sql/item_timefunc.h:
      Manual merge.
    sql/time.cc:
      Manual merge.
    dc09d7f3
func_time.test 17 KB