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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge 10.1 into 10.2	Marko Mäkelä	2019-05-13	1	-1/+1
\|\
\| *	Merge branch '5.5' into 10.1	Vicențiu Ciorbaru	2019-05-11	1	-1/+1
\| \|
* \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2018-06-21	1	-1/+1
\|\ \ \| \|/
\| *	Merge branch '10.0-galera' into 10.1	Vicențiu Ciorbaru	2018-06-12	1	-1/+1
\| \|\
\| \| *	Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera	Jan Lindström	2018-05-07	1	-1/+1
\| \| \|\
\| \| \| *	MW-384 protect access to wsrep_ready variable with mutex	Alexey Yurchenko	2017-10-19	1	-1/+1
\| \| \| \|
\| \| \| *	Merging revision 3839..3932 from codership-mysql/5.5.	Nirbhay Choubey	2014-01-09	1	-196/+14
\| \| \| \|
\| \| \| *	remerging wsrep files from lp:codership-mysql	Seppo Jaakola	2013-02-05	1	-0/+233
\| \| \| \|
\| \| \| *	re-merging wsrep files from lp:codership-mysql	Seppo Jaakola	2013-02-05	1	-233/+0
\| \| \| \|
\| \| \| *	Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25	Seppo Jaakola	2012-08-30	1	-3/+3
\| \| \| \|
\| \| \| *	References lp:1034621 - Merge up to mysql-5.5.25 level	Seppo Jaakola	2012-08-09	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merged codership-mysql/5.5 revisions: bzr diff -r3759..3767 merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
\| \| \| *	Added wsrep specific files	Seppo Jaakola	2012-04-26	1	-0/+231
\| \| \|
\| \| *	Refs codership/mysql-wsrep#33	Alexey Yurchenko	2015-05-08	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. factored XID-related functions to a separate wsrep_xid.cc unit. 2. refactored them to take refrences instead of pointers where appropriate 3. implemented wsrep_get/set_SE_position to take wsrep_uuid_t and wsrep_seqno_t instead of XID 4. call wsrep_set_SE_position() in wsrep_sst_received() to reinitialize SE checkpoint after SST was received, avoid assert() in setting code by first checking current position.
\| \| *	Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep ↵	Seppo Jaakola	2013-11-26	1	-10/+8
\| \| \| \| \| \| \| \| \| \| \| \|	API #24
\| \| *	bzr merge -r3890..3891 lp:codership-mysql/5.5	Seppo Jaakola	2013-11-06	1	-192/+14
\| \| \|
\| \| *	Merge 10.0 to galera-10.0	Jan Lindström	2013-09-03	1	-0/+233
\| \|
* \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2017-03-30	1	-1/+1
\|\ \ \| \|/
\| *	Correct FSF address	iangilfillan	2017-03-10	1	-1/+1
\| \|
* \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2016-06-30	1	-2/+6
\|\ \ \| \|/
\| *	MDEV-9618 solaris sparc build fails on 10.1.	Alexey Botchkov	2016-06-27	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Compiler on Sparc is strict about the 'const' modifiers in function declarations and definitions. Meaning they should be exactly same.
* \|	MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno	Nirbhay Choubey	2016-05-31	1	-2/+2
\|/ \| \| \| \| \| \| \| \|	- 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].
*	Merge branch '10.0-galera' into 10.1	Nirbhay Choubey	2015-07-14	1	-7/+5
\|
*	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+53
	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.