Alexander Nozdrin 077e7c9a87 Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/collections/default.experimental - mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test		2010-01-31 00:26:38 +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-31 00:26:38 +03:00