You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

60 lines
2.3 KiB

13 years ago
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
13 years ago
  1. State of MERGE between MariaDB 5.5 and MySQL 5.6.5-m8
  2. Featured copied/merged
  3. - storage/innodb/*
  4. - storage/perfschema
  5. - sql/share/errmsg-utf8.txt
  6. - mysqltest/suite/perfschema
  7. - All CF_XXX states in sql_class.h.
  8. - handler error messages.
  9. - Removed timestamp handling from all handler::write and handler::update
  10. methods.
  11. - Added PSI_CALLS to handler.cc
  12. - Added thd->m_statement_psi
  13. - Added variables Sys_ssl_crl & Sys_ssl_crlpath
  14. (Including support in all clients)
  15. - Added Ssl_server_not_before & Ssl_server_not_after variables
  16. (Including changes to yassl)
  17. - Added all mysql systems tables
  18. - TRANSACTION READ ONLY | READ WRITE
  19. Features recoded
  20. - Better error messages
  21. - Added support of timestamps to ha_write and ha_update.
  22. Fetures half done:
  23. - CF_XXX states added to init_update_queries() but not otherwise used.
  24. Short time TODO:
  25. - Add test cases for InnoDB
  26. - merge hostname.cc / hostname.h
  27. - add support for host_error()
  28. - Enable performance_schema.host_cache in scripts/mysql_system_tables.sql
  29. - Add Sys_my_bind_addr(); Needed for perfschema
  30. - Add support for format_section_buff in unireg.cc and table.cc
  31. - mysql_socket_shutdown() was removed from vio/viosocket.cc.
  32. It was replaced with inline function in include/mysql/psi/mysql_socket.h
  33. but this doesn't call DisconnectEx(). We should check if we need to
  34. add this to the inline function...
  35. Sergei's notes:
  36. davi.arnaut@oracle.com-20110531135209-8kxz4np8c4gav6s2 (soket timeouts)
  37. jorgen.loland@oracle.com-20100830063809-z3n0eu7qp1h5v3ip
  38. georgi.kodinov@oracle.com-20100705115749-wbpt45mgjqmpvp07 (--drop-trigger)
  39. magnus.blaudd@sun.com-20100526100500-4cmalb9khnsj4ptt (--bind-addr)
  40. alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni (binlogging of DROP TEMPORARY)
  41. anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y (don't binlog rolled back changes)
  42. mysql-test/suite/perfschema/disabled.def
  43. why --source include/have_innodb.inc in lots of tests? (with no other changes)
  44. Sys_var_tx_read_only not needed (must be the same as Sys_var_tx_isolation)
  45. SIGNAL/RESIGNAL ?
  46. fix mysql-test to know the difference between compiled-in innodb and compiled-in xtradb
  47. remove my_getopt_use_args_separator
  48. Master_info::read_info & Master_info::write_info
  49. rpl_slave.cc
  50. XXX in mysql_client_test
  51. net_serv.cc