Alexey Kopytov 4db97ede5b Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ...

Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am

2010-03-12 12:51:53 +03:00

3.0 KiB

Raw Blame History

View Raw