Alexander Nozdrin 09942fe8e8 Manual merge from mysql-trunk-merge. ... Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy		2009-12-16 21:02:21 +03:00
..
binlog_tests	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw	2009-11-30 14:34:39 +02:00
rpl_tests	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00