Alexander Nozdrin 31ba3bf5cb Manual merge from mysql-5.1-bugteam. ...

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

2010-02-03 17:01:48 +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-02-03 17:01:48 +03:00