• unknown's avatar
    Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 937504e7
    unknown authored
    into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
    
    
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/sql_yacc.yy:
      manual merge
    937504e7
item_strfunc.h 21.8 KB