• unknown's avatar
    Merge polly.local:/tmp/maint/bug11655/my50-bug11655 · 186b8312
    unknown authored
    into  polly.local:/tmp/maint/bug11655/my51-bug11655
    
    
    include/my_time.h:
      Auto merged
    mysql-test/r/func_sapdb.result:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/time.cc:
      Auto merged
    mysql-test/r/func_time.result:
      Manually merged
    mysql-test/t/func_time.test:
      Manually merged
    186b8312
func_sapdb.result 9.8 KB