mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Manual merge from mysql-5.1 into mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in sql/handler.h Text conflict in storage/archive/ha_archive.cc