-
unknown authored
into mysql.com:/home/ram/work/b31615/b31615.5.0 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged
d90b719d
into mysql.com:/home/ram/work/b31615/b31615.5.0 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged