• unknown's avatar
    Merge polly.local:/tmp/maint/bug11655/my41-bug11655 · 0e371de9
    unknown authored
    into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
    
    
    sql/field.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    mysql-test/r/func_time.result:
      Manually merged
    mysql-test/t/func_time.test:
      Manually merged
    0e371de9
field.cc 179 KB