13 commits

Author	SHA1	Message	Date
iangilfillan	f0ec34002a	Correct FSF address	2017-03-10 18:21:29 +01:00
Nirbhay Choubey	90266e8a0e	Merge branch '10.0-galera' into bb-10.1-serg	2016-08-25 15:39:39 -04:00
Nirbhay Choubey	3f481e52e4	Fixes for failing tests (post-merge).	2016-08-21 20:09:05 -04:00
Daniele Sciascia	92162e6d87	MW-175 Fix definitively lost memory in wsrep_get_params	2016-08-21 16:17:13 -04:00
Sergei Golubchik	1993780284	fix build on sol10-64	2015-10-15 12:23:04 +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
Nirbhay Choubey	0903e2b744	Fix for a segfault.	2014-05-21 16:03:58 -04:00
Nirbhay Choubey	81a85ad8d7	bzr merge -r3985..3991 codership/5.5	2014-05-21 15:04:13 -04:00
Nirbhay Choubey	99df0fbad5	bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).	2014-05-21 14:32:57 -04:00
Nirbhay Choubey	899f9801d4	bzr merge -r3946..3968 codership/5.5	2014-03-25 17:01:05 -04:00
Seppo Jaakola	b098b7a84c	bzr merge -r3904..3928 lp:codership-mysql/5.5 ... This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6	2013-11-27 00:18:44 +02:00
Seppo Jaakola	a2594e96f7	Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API #24	2013-11-26 16:48:30 +02:00
Jan Lindström	ba3ff50ab2	Merge 10.0 to galera-10.0	2013-09-03 17:50:36 +03:00