• unknown's avatar
    Merge mysql.com:/usr/home/ram/work/mysql-4.1 · c6b67f0d
    unknown authored
    into  mysql.com:/usr/home/ram/work/mysql-5.0
    
    
    mysql-test/r/func_str.result:
      Auto merged
    mysql-test/t/func_str.test:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    mysql-test/r/func_time.result:
      SCCS merged
    c6b67f0d
func_time.test 23.9 KB