• unknown's avatar
    Merge mysql.com:/home/ram/work/b23616/b23616.5.0 · e5d9a306
    unknown authored
    into  mysql.com:/home/ram/work/b23616/b23616.5.1
    
    
    mysql-test/r/func_sapdb.result:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    e5d9a306
func_time.result 50.6 KB