-
unknown authored
sql/item_strfunc.h: Auto merged mysql-test/r/ctype_ucs.result: Add --echo End of 5.0 tests mysql-test/t/ctype_ucs.test: Add --echo End of 5.0 tests sql/item_strfunc.cc: Manual merge
0cb3d26d
sql/item_strfunc.h: Auto merged mysql-test/r/ctype_ucs.result: Add --echo End of 5.0 tests mysql-test/t/ctype_ucs.test: Add --echo End of 5.0 tests sql/item_strfunc.cc: Manual merge