• unknown's avatar
    Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines · 040139c5
    unknown authored
    into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
    
    
    include/my_sys.h:
      Auto merged
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    mysys/charset.c:
      Manual merge.
    sql/item_func.cc:
      Manual merge.
    040139c5
charset.c 23.2 KB