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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '10.1' into 10.2	Sergei Golubchik	2016-09-09	1	-0/+3
\|\
\| *	Post merge fixes.	Nirbhay Choubey	2016-08-25	1	-0/+2
\| \|
\| *	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	1	-0/+1
\| \|\
\| \| *	MW-267 Enforce wsrep_max_ws_size limit in wsrep provider	Daniele Sciascia	2016-07-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| *	bzr merge -c4123 codership/5.6/	Nirbhay Choubey	2014-08-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(minus http://bazaar.launchpad.net/~codership/codership-mysql/5.6/revision/4122)
\| \| *	Local merge of patch for MDEV-4647 from maria-5.5-galera.	Nirbhay Choubey	2014-07-22	1	-1/+3
\| \| \|
\| \| *	bzr merge -r3895..3903 lp:codership-mysql/5.5	Seppo Jaakola	2013-11-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is just before 5.5.34 merge in wsrep-5.5 branch
\| \| *	bzr merge -r3890..3891 lp:codership-mysql/5.5	Seppo Jaakola	2013-11-06	1	-0/+81
\| \|
* \|	MDEV-10492: Assertion failure on shutdown when wsrep_sst_auth set in config	Nirbhay Choubey	2016-08-03	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The memory alloc-ed initially for wsrep_sst_auth to store the value specified in config was lost as the global variable was reset while in process of masking it and thus, could never be reclaimed on shutdown.
* \|	MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno	Nirbhay Choubey	2016-05-31	1	-1/+1
\|/ \| \| \| \| \| \| \| \|	- Validate the specified wsrep_start_position value by also checking the return status of wsrep->sst_received. This also ensures that changes in wsrep_start_position is not allowed when the node is not in JOINING state. - Do not allow decrease in seqno within same UUID. - The initial checkpoint in SEs should be [0...:-1].
*	Improve performance for calculating memory allocation	Monty	2015-02-01	1	-0/+3
\| \| \| \|	Extend interface for 'show variables' with current scope
*	fixing embedded: first set of changes (storage engines don't work yet)	Sergei Golubchik	2014-10-01	1	-1/+1
\|
*	cleanup: galera merge, simple changes	Sergei Golubchik	2014-10-01	1	-2/+17
\|
*	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+86
	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.