into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/item_func.cc: Auto merged