6 Commits

Author	SHA1	Message	Date
Sergei Golubchik	658992699b	Merge tag 'mariadb-10.0.20' into 10.1	2015-06-27 20:35:26 +02:00
Sergei Golubchik	ede08808e9	Merge branch 'merge-perfschema-5.6' into 10.0	2015-06-16 12:47:58 +02:00
Sergei Golubchik	3c3724991e	5.6.25	2015-06-16 11:00:33 +02:00
Jan Lindström	df4dd593f2	MDEV-6247: Merge 10.0-galera to 10.1. ... Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.	2014-08-26 15:43:46 +03:00
Sergei Golubchik	5ffe939a6c	perfschema 5.6.17	2014-05-07 16:12:16 +02:00
Sergei Golubchik	04bce7b569	5.6.17	2014-05-07 10:04:30 +02:00