summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb_load_xa.result
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-0/+2
|\ | | | | | | | | referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
| * Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: client/mysql_upgrade.c mysql-test/r/func_misc.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/innodb/r/innodb-fk.result mysql-test/t/subselect_sj_mat.test sql/item.cc sql/item_func.cc sql/log.cc sql/log_event.cc sql/rpl_utility.cc sql/slave.cc sql/sql_class.cc sql/sql_class.h sql/sql_select.cc storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/handler/ha_innodb.cc storage/xtradb/dict/dict0crea.c storage/xtradb/dict/dict0dict.c storage/xtradb/handler/ha_innodb.cc vio/viosslfactories.c
| | * MDEV-8474: InnoDB sets per-connection data unsafelyJan Lindström2015-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: At check_trx_exists function InnoDB allocates a new trx if no trx is found from thd but this newly allocated trx is not registered to thd. This is unsafe, because nothing prevents InnoDB plugin from being uninstalled while there's active transaction. This can cause crashes, hang and any other odd behavior. It may also corrupt stack, as functions pointers are not available after dlclose. Fix: The fix is to use thd_set_ha_data() when manipulating per-connection handler data. It does appropriate plugin locking.
* | | after-merge fixesSergei Golubchik2014-10-151-8/+3
|/ /
* | 5.5.39 mergeSergei Golubchik2014-08-071-2/+3
|/
* MDEV-6497 InnoDB deadlocks on UNINSTALL PLUGINSergei Golubchik2014-07-291-0/+13
| | | | Free the trx of the current thd (if any) in innobase_end()
* MDEV-6082 Assertion `0' fails in TC_LOG_DUMMY::log_and_order on DML after ↵Sergei Golubchik2014-07-271-0/+7
installing TokuDB at runtime on server with disabled InnoDB We don't support changing tc_log implementation at run time. If the first XA-capable engine is loaded with INSTALL PLUGIN - disable its XA capabilities with a warning