• unknown's avatar
    Merge mysql.com:/opt/local/work/tmp_merge · c4cffdbf
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-merge
    
    
    mysql-test/r/func_sapdb.result:
      Auto merged
    mysql-test/t/func_sapdb.test:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    mysql-test/r/func_time.result:
      Manual merge.
    mysql-test/t/func_time.test:
      Manual merge.
    c4cffdbf
func_sapdb.result 9.57 KB