- Take into account that Dynamic_array::back() now returns
pointer to the last element (it used to return pointer to
right after the last element)
- Fix error messages merge: ER_INTERNAL_ERROR was defined
independently by both mysql-5.6 and mariadb-5.5. Switch
to their error number, and still support ours for compatibility.
- strict.test updated (changed back) after the cset with "Fix
type_newdecimal.test ..." two csets ago
- row-checksum.test changed the code from HA_WRONG_CREATE_OPTION
to ER_ILLEGAL_HA_CREATE_OPTION, like mysql-5.6 did
- MariaDB does not have mysql.slave_master_info, mysql.slave_relay_log_info ,mysql.slave_worker_info
or mysql.ndb_binlog_index tables.
- Some tests expected to have these tables (this was an incorrect merge from 5.6, which merged
necessary tables like mysql.innodb*stats, but also got these tables)
- make the test output stable
- make Log_to_csv_event_handler::log_slow() to write the value
of thd->thread_id (it didn't, and so 0 was always logged).
Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.
sql/sql_partition.cc:
Full merge with 5.6
sql/sql_table.cc:
Merged all ddl_logging code
sql/strfunc.cc:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table
With this patch, all tests perfschema.hostcache_* pass.
There are still some additional unmerged minor changes to these tests
in mysql 5.6.10.
mysql-test/r/mdl_sync.result:
Full merge with 5.6
mysql-test/t/mdl_sync.test:
Full merge with 5.6
sql/debug_sync.cc:
Full merge with 5.6
sql/debug_sync.h:
Full merge with 5.6
sql/mdl.cc:
Full merge with 5.6
sql/sql_base.cc:
Removed code not in 5.6 anymore
