4 Commits

Author	SHA1	Message	Date
Sergei Golubchik	42f359f982	after-merge fixes	2014-10-15 22:42:08 +02:00
Sergei Golubchik	6fb17a0601	5.5.39 merge	2014-08-07 18:06:56 +02:00
Sergei Golubchik	6ef139780d	MDEV-6497 InnoDB deadlocks on UNINSTALL PLUGIN ... Free the trx of the current thd (if any) in innobase_end()	2014-07-29 09:09:52 +02:00
Sergei Golubchik	a6071cc596	MDEV-6082 Assertion `0' fails in TC_LOG_DUMMY::log_and_order on DML after 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	2014-07-27 21:02:00 +02:00