Alexander Nozdrin 9dc8347c1e Manual merge from mysql-trunk-merge. ...

Conflicts:
  - mysql-test/t/bug46080.test

2010-02-03 19:21:17 +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-02-03 19:21:17 +03:00