• unknown's avatar
    Manually merged · 0e7f2f5b
    unknown authored
    
    mysql-test/r/cast.result:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    sql/opt_sum.cc:
      Auto merged
    sql/structs.h:
      Auto merged
    0e7f2f5b
item_timefunc.h 25.5 KB