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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	1	-1/+1
\|\
\| *	MW-267 Enforce wsrep_max_ws_size limit in wsrep provider	Daniele Sciascia	2016-07-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes variable wsrep_max_ws_size so that its value is linked to the value of provider option repl.max_ws_size. That is, changing the value of variable wsrep_max_ws_size will change the value of provider option repl.max_ws_size, and viceversa. The writeset size limit is always enforced in the provider, regardless of which option is used.
\| *	cleanup: remove duplicate declaration	Nirbhay Choubey	2015-02-19	1	-3/+0
\| \|
\| *	bzr merge -r4065..4088 codership/5.6	Nirbhay Choubey	2014-05-21	1	-0/+3
\| \|
\| *	bzr merge -r3946..3968 codership/5.5	Nirbhay Choubey	2014-03-25	1	-0/+3
\| \|
\| *	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	Seppo Jaakola	2013-12-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues
\| *	Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep ↵	Seppo Jaakola	2013-11-26	1	-0/+49
\| \| \| \|	API #24
*	MDEV-9618 solaris sparc build fails on 10.1.	Alexey Botchkov	2016-06-27	1	-4/+4
\| \| \| \| \| \|	Compiler on Sparc is strict about the 'const' modifiers in function declarations and definitions. Meaning they should be exactly same.
*	MDEV-7867: Add binlog header to GRA_.log file	Nirbhay Choubey	2015-04-01	1	-3/+4
\|
*	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+59
	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.