• unknown's avatar
    Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint · d165736b
    unknown authored
    into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
    
    
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_string.cc:
      Auto merged
    strings/strtod.c:
      Auto merged
    client/mysql.cc:
      Manual merge.
    mysql-test/r/ctype_utf8.result:
      Manual merge.
    d165736b
func_time.result 46.1 KB