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
\|
*	refs MW-245 - merged wsrep_dirty_reads and wsrep_reject_queries from PXC	sjaakola	2018-03-20	1	-0/+1
\|
*	MDEV-12837: WSREP: BF lock wait long	Jan Lindström	2017-12-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is 10.1 version where no merge error exists. wsrep_on_check New check function. Galera can't be enabled if innodb-lock-schedule-algorithm=VATS. innobase_kill_query In Galera async kill we could own lock mutex. innobase_init If Variance-Aware-Transaction-Sheduling Algorithm (VATS) is used on Galera we refuse to start InnoDB. Changed innodb-lock-schedule-algorithm as read-only parameter as it was designed to be. lock_rec_other_has_expl_req, lock_rec_other_has_conflicting, lock_rec_lock_slow lock_table_other_has_incompatible lock_rec_insert_check_and_lock Change pointer to conflicting lock to normal pointer as this pointer contents could be changed later.
*	Merge remote-tracking branch 'origin/10.0-galera' into 10.1	Jan Lindström	2017-08-21	1	-3/+1
\|\
* \|	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
\|
*	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.