summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12Philip Stoev2016-02-221-1/+1
* Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193-9/+8
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-1/+1
| |\
| | * MDEV-8978 Specify GPL version in RPM metadataJulien Pivotto2015-12-091-1/+1
| * | MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-062-8/+7
* | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-312-4/+7
|\ \ \ | |/ /
| * | Fixed Fedora 22 package build failure.Sergey Vojtovich2015-10-261-0/+1
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-4/+6
| |\ \ | | |/
| | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-4/+6
| | |\
| | | * Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENTTor Didriksen2015-07-131-4/+6
* | | | Update WSREP_PATCH_REVNONirbhay Choubey2015-09-101-2/+2
* | | | Correct WSREP_PATCH_VERSION for 5.6 is 11Philip Stoev2015-09-091-1/+1
* | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-091-3/+3
|\ \ \ \
| * | | | Update WSREP_PATCH_REVNONirbhay Choubey2015-09-091-2/+2
| * | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12Philip Stoev2015-09-091-1/+1
| * | | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-214-100/+100
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-187-61/+52
| |\ \ \ \ \
| * | | | | | Add cmake check for getifaddrs.Nirbhay Choubey2015-01-271-0/+1
| * | | | | | Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-225-81/+102
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge revisions from maria/5.5Nirbhay Choubey2014-12-162-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | MDEV-7204: mariadb-galera-server el7 rpms packagingNirbhay Choubey2014-12-091-1/+3
| * | | | | | | | bzr merge -r4015..4026 codership/5.5Nirbhay Choubey2014-10-091-2/+2
| * | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-094-107/+61
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merged r4014 from codership/5.5Nirbhay Choubey2014-08-121-1/+1
| * | | | | | | | | Updated WSREP_PATCH_REVNO.Nirbhay Choubey2014-08-061-1/+1
| * | | | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-063-32/+44
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-101-1/+1
| * | | | | | | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-102-4/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added rsync to galera server's debian/rpm dependency list.Nirbhay Choubey2014-05-291-2/+2
| * | | | | | | | | | | MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' isNirbhay Choubey2014-05-251-5/+2
| * | | | | | | | | | | MDEV#5925: New mariadb-galera-test packagesNirbhay Choubey2014-05-121-2/+3
| * | | | | | | | | | | Updated WSREP_PATCH_REVNO.Nirbhay Choubey2014-04-181-1/+1
| * | | | | | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-161-1/+1
| * | | | | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-165-16/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MDEV#5903 mariadb-galera tree builds too many rpm packagesmariadb-galera-5.5.36aNirbhay Choubey2014-03-201-3/+1
| * | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-1/+1
| * | | | | | | | | | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-254-31/+149
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | * Merged the missing revision 3934 fromNirbhay Choubey2014-02-051-1/+1
| * | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-293-21/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | The bzr revision visible in @@version_comment shouldNirbhay Choubey2014-01-231-17/+8
| * | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-092-8/+1
| * | | | | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-253-8/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | MDEV-3895 Version naming for MariaDB-Galera buildsNirbhay Choubey2013-11-221-7/+21
| * | | | | | | | | | | | | | | revert the change for auto-rpm-packages for plugins.Sergei Golubchik2013-09-271-11/+1
| * | | | | | | | | | | | | | | mariadb-5.5.33a mergeJan Lindström2013-09-271-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-1/+1
| * | | | | | | | | | | | | | | | fix broken (after merge) galera deb packagingSergei Golubchik2013-09-181-2/+2
| * | | | | | | | | | | | | | | | cmake error on osxSergei Golubchik2013-09-181-1/+1
| * | | | | | | | | | | | | | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-187-13/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \