Alexander Nozdrin 2b90de942c Manual merge from mysql-trunk-merge. ... Conflicts: - sql/event_db_repository.cc - sql/events.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_udf.cc		2010-01-30 23:09:31 +03:00
..
binlog_tests	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
rpl_tests	Manual merge from mysql-trunk-merge.	2010-01-30 23:09:31 +03:00