• unknown's avatar
    Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 · 6c65f05c
    unknown authored
    into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51
    
    
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    6c65f05c
item_strfunc.h 24.1 KB