summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-282-0/+7
|\
| * Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914Kristian Nielsen2016-10-211-0/+4
| * Attempt to fix strange rpm dependency issue following prior patchKristian Nielsen2016-09-101-0/+3
* | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-08-211-1/+1
* | Bump WSREP_PATCH_VERSION to 16Philip Stoev2016-08-211-1/+1
* | Bump WSREP_PATCH_VERSION to 14Philip Stoev2016-08-211-1/+1
* | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-3/+6
|\ \ | |/
| * MDEV-9869 INSTALL SONAME 'ha_connect'Sergei Golubchik2016-04-241-1/+4
| * Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-2/+2
* | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-02-231-1/+1
* | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-235-8/+25
|\ \ | |/
| * MDEV-9350 Fix jemalloc detection for FreeBSDSergei Golubchik2016-02-171-7/+11
| * MYSQL_ADD_PLUGIN: fix DISABLED keyword to workSergei Golubchik2016-02-171-1/+1
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+3
| |\
| | * dtrace in cmakeSergei Golubchik2016-02-151-0/+3
| | * MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-062-8/+7
| * | Merge branch '5.5' into 10.0Alexey Botchkov2016-01-251-0/+5
| |\ \ | | |/
| | * MDEV-9298 : Build failure when linking libmysql.Vladislav Vaintroub2016-01-071-0/+5
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-211-0/+5
| |\ \ | | |/
| | * MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ‘ERR_remove_stat...Sergei Golubchik2015-12-211-0/+5
* | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13Philip Stoev2016-02-231-1/+1
* | | 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
| |\ \ \ \ \ \ \ \ \ \