• unknown's avatar
    Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 96bc9f80
    unknown authored
    into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
    
    
    client/mysql.cc:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      Auto merged
    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
    96bc9f80
item_strfunc.cc 80.3 KB