summaryrefslogtreecommitdiff
path: root/sql/wsrep_sst.cc
Commit message (Expand)AuthorAgeFilesLines
* Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-40/+101
|\
| * * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-37/+88
| * bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-1/+2
| * bzr merge -r3928..3932 codership/5.5Nirbhay Choubey2014-03-251-2/+11
|/
* * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-0/+33
* merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-13/+24
* Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-16/+31
* bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-1/+3
* Merge fixes, now at level 3430 in mariadb-galera-5.5Seppo Jaakola2013-10-071-2/+2
* Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-071-3/+3
* Merge 10.0 to galera-10.0Jan Lindström2013-09-031-0/+1004