Alexander Nozdrin 85c54dddc7 Manual merge from mysql-5.1-bugteam. ...

Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test

2010-01-30 22:13:36 +03:00

..

binlog_tests

Manual merge from mysql-trunk-merge.

2009-11-06 17:20:27 +03:00

rpl_tests

Manual merge from mysql-5.1-bugteam.

2010-01-30 22:13:36 +03:00