Commit 91128dd9 authored by Sergei Golubchik's avatar Sergei Golubchik

remove now-obsolete "5.5+5.6 merge" TODO file

parent c39a10bb
...@@ -474,7 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL ...@@ -474,7 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
INSTALL_DOCUMENTATION(README TODO CREDITS COPYING COPYING.LESSER INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER
COMPONENT Readme) COMPONENT Readme)
INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
${CMAKE_BINARY_DIR}/Docs/INFO_BIN) ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
......
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:
- CF_XXX states added to init_update_queries() but not otherwise used.
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 Sys_my_bind_addr(); Needed for perfschema
- Add support for format_section_buff in unireg.cc and table.cc
- 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...
Sergei's notes:
davi.arnaut@oracle.com-20110531135209-8kxz4np8c4gav6s2 (soket timeouts)
jorgen.loland@oracle.com-20100830063809-z3n0eu7qp1h5v3ip
georgi.kodinov@oracle.com-20100705115749-wbpt45mgjqmpvp07 (--drop-trigger)
magnus.blaudd@sun.com-20100526100500-4cmalb9khnsj4ptt (--bind-addr)
alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni (binlogging of DROP TEMPORARY)
anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y (don't binlog rolled back changes)
mysql-test/suite/perfschema/disabled.def
why --source include/have_innodb.inc in lots of tests? (with no other changes)
Sys_var_tx_read_only not needed (must be the same as Sys_var_tx_isolation)
SIGNAL/RESIGNAL ?
fix mysql-test to know the difference between compiled-in innodb and compiled-in xtradb
remove my_getopt_use_args_separator
Master_info::read_info & Master_info::write_info
rpl_slave.cc
XXX in mysql_client_test
net_serv.cc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment