delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '5.5' into 10.1	Vicențiu Ciorbaru	2019-05-11	1	-1/+1
\|
*	Correct FSF address	iangilfillan	2017-03-10	1	-1/+1
\|
*	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	1	-6/+31
\|\
\| *	GCF-837 Check wsrep interface version before loading provider	Daniele Sciascia	2016-08-21	1	-6/+31
\| \|
\| *	Fix for build failures on Power8	Nirbhay Choubey	2015-02-20	1	-12/+9
\| \|
\| *	Added missing files	Seppo Jaakola	2014-01-17	1	-0/+203
\| \|
\| *	bzr merge -r3904..3928 lp:codership-mysql/5.5	Seppo Jaakola	2013-11-27	1	-203/+0
\| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep ↵	Seppo Jaakola	2013-11-26	1	-2/+6
\| \| \| \| \| \| \| \|	API #24
\| *	Merge 10.0 to galera-10.0	Jan Lindström	2013-09-03	1	-0/+199
\|
*	compiler warnings	Sergei Golubchik	2015-01-31	1	-12/+10
\|
*	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+203
	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.