summaryrefslogtreecommitdiff
path: root/sql/wsrep_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
* | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+1
|\ \ | |/
| * Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| |\
| | * Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-1/+1
| | |\
| | | * MW-384 protect access to wsrep_ready variable with mutexAlexey Yurchenko2017-10-191-1/+1
| | | * Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-196/+14
| | | * remerging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-0/+233
| | | * re-merging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-233/+0
| | | * Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25Seppo Jaakola2012-08-301-3/+3
| | | * References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-3/+5
| | | * Added wsrep specific filesSeppo Jaakola2012-04-261-0/+231
| | * Refs codership/mysql-wsrep#33Alexey Yurchenko2015-05-081-7/+5
| | * Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-10/+8
| | * bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-192/+14
| | * Merge 10.0 to galera-10.0Jan Lindström2013-09-031-0/+233
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+1
|\ \ | |/
| * Correct FSF addressiangilfillan2017-03-101-1/+1
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-2/+6
|\ \ | |/
| * MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-06-271-2/+5
* | MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqnoNirbhay Choubey2016-05-311-2/+2
|/
* Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-141-7/+5
* MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+53