• unknown's avatar
    Merge polly.local:/tmp/maint/bug11655/my50-bug11655 · be0f6405
    unknown authored
    into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
    
    
    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
    be0f6405
func_time.result 48.7 KB