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	6	-6/+6
\|
*	Correct FSF address	iangilfillan	2017-03-10	4	-4/+4
\|
*	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	2	-8/+40
\|\
\| *	Fixes for failing tests (post-merge).	Nirbhay Choubey	2016-08-21	1	-2/+9
\| \|
\| *	GCF-837 Check wsrep interface version before loading provider	Daniele Sciascia	2016-08-21	1	-6/+31
\| \|
\| *	MW-175 Fix definitively lost memory in wsrep_get_params	Daniele Sciascia	2016-08-21	1	-1/+1
\| \|
\| *	Fix for build failures on Power8	Nirbhay Choubey	2015-02-20	1	-12/+9
\| \|
\| *	Fix for a segfault.	Nirbhay Choubey	2014-05-21	1	-1/+1
\| \|
\| *	bzr merge -r3985..3991 codership/5.5	Nirbhay Choubey	2014-05-21	1	-2/+19
\| \|
\| *	bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).	Nirbhay Choubey	2014-05-21	1	-45/+5
\| \|
\| *	bzr merge -r3946..3968 codership/5.5	Nirbhay Choubey	2014-03-25	2	-5/+48
\| \|
\| *	Added missing files	Seppo Jaakola	2014-01-17	4	-0/+384
\| \|
\| *	bzr merge -r3904..3928 lp:codership-mysql/5.5	Seppo Jaakola	2013-11-27	6	-341/+41
\| \| \| \| \| \| \| \| \| \| \| \|	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	4	-293/+552
\| \| \| \| \| \| \| \|	API #24
\| *	Merge 10.0 to galera-10.0	Jan Lindström	2013-09-03	6	-0/+1546
\|
*	fix build on sol10-64	Sergei Golubchik	2015-10-15	2	-13/+11
\|
*	compiler warnings	Sergei Golubchik	2015-01-31	1	-12/+10
\|
*	cleanup: galera merge, simple changes	Sergei Golubchik	2014-10-01	1	-3/+0
\|
*	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	6	-0/+1910
	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.