State of MERGE between MariaDB 5.5 and MySQL 5.6.5-m8 Featured copied/merged - storage/innodb/* - storage/perfschema - sql/share/errmsg-utf8.txt - mysqltest/suite/perfschema - All CF_XXX states in sql_class.h. - handler error messages. - Removed timestamp handling from all handler::write and handler::update methods. - Added PSI_CALLS to handler.cc - Added thd->m_statement_psi - Added variables Sys_ssl_crl & Sys_ssl_crlpath (Including support in all clients) - Added Ssl_server_not_before & Ssl_server_not_after variables (Including changes to yassl) - Added all mysql systems tables - TRANSACTION READ ONLY | READ WRITE Features recoded - Better error messages - Added support of timestamps to ha_write and ha_update. Fetures half done: - Support for TRANSACTION READ ONLY | READ WRITE - CF_XXX states added to init_update_queries() but not otherwise used. - Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath) Short time TODO: - Add test cases for InnoDB - merge hostname.cc / hostname.h - add support for host_error() - Enable performance_schema.host_cache in scripts/mysql_system_tables.sql - Add full support for automatic timestamp. (remove timestamp handling from ha_write()) - Timour is working on this - Add Sys_my_bind_addr(); Needed for perfschema - Add THD_STAGE_INFO everywhere. - mysql_socket_shutdown() was removed from vio/viosocket.cc. It was replaced with inline function in include/mysql/psi/mysql_socket.h but this doesn't call DisconnectEx(). We should check if we need to add this to the inline function...