-
unknown authored
into mysql.com:/home/bk/b18293-mysql-5.1-new sql/item.cc: Auto merged mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sp_head.cc: Auto merged mysql-test/r/binlog_stm_ctype_ucs.result: Merge with mysql-5.0
e57fc8a4