2012-08-17 15:46:34 +02:00
|
|
|
State of MERGE between MariaDB 5.5 and MySQL 5.6.5-m8
|
2012-08-07 06:25:15 +02:00
|
|
|
|
|
|
|
|
Featured copied/merged
|
|
|
|
|
- storage/innodb/*
|
|
|
|
|
- storage/perfschema
|
|
|
|
|
- sql/share/errmsg-utf8.txt
|
2012-08-14 16:23:34 +02:00
|
|
|
- mysqltest/suite/perfschema
|
2012-08-07 06:25:15 +02:00
|
|
|
- All CF_XXX states in sql_class.h.
|
|
|
|
|
- handler error messages.
|
|
|
|
|
- Removed timestamp handling from all handler::write and handler::update
|
|
|
|
|
methods.
|
2012-08-14 16:23:34 +02:00
|
|
|
- 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)
|
2012-08-31 22:52:08 +02:00
|
|
|
- Added all mysql systems tables
|
|
|
|
|
- TRANSACTION READ ONLY | READ WRITE
|
2012-08-07 06:25:15 +02:00
|
|
|
|
|
|
|
|
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:
|
2012-08-31 22:52:08 +02:00
|
|
|
- Add test cases for InnoDB
|
2012-08-07 06:25:15 +02:00
|
|
|
|
|
|
|
|
- merge hostname.cc / hostname.h
|
|
|
|
|
- add support for host_error()
|
|
|
|
|
- Enable performance_schema.host_cache in scripts/mysql_system_tables.sql
|
|
|
|
|
|
2012-08-31 22:52:08 +02:00
|
|
|
- Add Sys_my_bind_addr(); Needed for perfschema
|
2012-08-14 16:23:34 +02:00
|
|
|
|
2013-06-15 17:32:08 +02:00
|
|
|
- Add support for format_section_buff in unireg.cc and table.cc
|
|
|
|
|
|
2012-08-14 16:23:34 +02:00
|
|
|
- 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...
|
fixes for test failures
and small collateral changes
mysql-test/lib/My/Test.pm:
somehow with "print" we get truncated writes sometimes
mysql-test/suite/perfschema/r/digest_table_full.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/dml_handler.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/information_schema.result:
host table is not ported over yet
mysql-test/suite/perfschema/r/nesting.result:
this differs, because we don't rewrite general log queries, and multi-statement
packets are logged as a one entry. this result file is identical to what mysql-5.6.5
produces with the --log-raw option.
mysql-test/suite/perfschema/r/relaylog.result:
MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB.
mysql-test/suite/perfschema/r/server_init.result:
MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup.
mysql-test/suite/perfschema/r/stage_mdl_global.result:
this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not
do that, and this causes useless mutex locks and waits.
mysql-test/suite/perfschema/r/statement_digest.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_consumers.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/perfschema/r/statement_digest_long_query.result:
md5 hashes of statement digests differ, because yacc token codes are different in mariadb
mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result:
will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
2012-09-27 20:09:46 +02:00
|
|
|
|
|
|
|
|
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
|