-
unknown authored
into rurik.mysql.com:/home/igor/mysql-5.0-opt sql/item_sum.cc: Auto merged mysql-test/r/ctype_ucs.result: Manual merge mysql-test/t/ctype_ucs.test: Manual merge
315d8b07
into rurik.mysql.com:/home/igor/mysql-5.0-opt sql/item_sum.cc: Auto merged mysql-test/r/ctype_ucs.result: Manual merge mysql-test/t/ctype_ucs.test: Manual merge