summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-272-2/+5
|\
| * * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-0/+3
| * Updated WSREP_PATCH_REVNO.Nirbhay Choubey2014-03-251-1/+1
| * bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-1/+1
* | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-269-95/+131
|\ \
| * | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-043-3/+18
| * | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-272-86/+86
| * | 10.0-base mergeSergei Golubchik2014-02-264-32/+120
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-254-32/+120
| | |\ \
| | | * | MDEV-5390 doesn't install on fedora if mysql is installed, part 2Sergei Golubchik2014-02-191-0/+6
| | | * | RPM:Sergei Golubchik2014-02-192-32/+109
| | | * | RPM: fix alternative provides/obsoletes - put the correct architecture and ve...Sergei Golubchik2014-02-171-6/+11
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-2/+1
| | | |\ \
| | | | * | Updated/added copyright headersMurthy Narkedimilli2014-01-061-2/+1
| | | * | | Do not include .result~ files and such into packagesElena Stepanova2014-02-101-0/+1
| * | | | | Automatic mergeMichael Widenius2014-02-051-0/+2
| |\ \ \ \ \
| | * | | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-0/+2
| * | | | | | 10.0-base mergeSergei Golubchik2014-02-032-4/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | 5.5 mergeSergei Golubchik2014-02-012-4/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Change our INSTALL_DEBUG_SYMBOLS cmake function to be less pickySergei Golubchik2014-01-231-2/+2
| | | * | | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-2/+5
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINEDJon Olav Hauglid2013-10-211-2/+5
* | | | | | Merging deb/rpm script changes from maria-5.5-galera.Nirbhay Choubey2014-03-241-27/+128
| |_|_|_|/ |/| | | |
* | | | | Fixed install_macros.cmake to set the correctNirbhay Choubey2014-02-191-3/+2
* | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-16/+21
* | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-254-108/+32
|\ \ \ \ \ | |/ / / /
| * | | | use -visibility=hidden also for plugins linked statically into libmysqldSergei Golubchik2013-12-221-0/+1
| * | | | use dynamic libaio for ha_xtradb.soSergei Golubchik2013-12-221-2/+2
| * | | | 10.0-base mergeSergei Golubchik2013-12-162-17/+29
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2013-12-152-17/+29
| | |\ \ \ | | | |/ /
| | | * | install and package plugin suites.Sergei Golubchik2013-11-272-17/+29
| * | | | remove unused libevent (that was merged from 5.6 by mistake)Sergei Golubchik2013-11-211-89/+0
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0410-26/+148
|\ \ \ \ \ | |/ / / /
| * | | | add missing plugins to deb packagesSergei Golubchik2013-11-141-1/+1
| * | | | 10.0-base mergeSergei Golubchik2013-11-131-0/+2
| |\ \ \ \ | | |/ / /
| | * | | 5.5. mergeSergei Golubchik2013-11-131-0/+2
| | |\ \ \ | | | |/ /
| | | * | MDEV-5250 doesn't install on fedora if mysql is installedSergei Golubchik2013-11-071-0/+2
| * | | | syntax error in the cmake fileSergei Golubchik2013-11-021-1/+1
| * | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-152-4/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge 5.5->10.0-baseIgor Babaev2013-10-131-3/+4
| | |\ \ \ | | | |/ /
| | | * | MDEV-5076 : Build on FreeBSD - when looking for execinfo library, and execinf...Vladislav Vaintroub2013-09-261-3/+4
| | * | | A follow-up for the previous commit:Alexander Barkov2013-10-021-0/+1
| | * | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-1/+1
| * | | | merge 10.0-base -> 10.0unknown2013-09-261-5/+18
| |\ \ \ \ | | |/ / /
| | * | | merge 5.5 -> 10.0-baseunknown2013-09-251-5/+18
| | |\ \ \ | | | |/ /
| | | * | MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX.Vladislav Vaintroub2013-09-241-4/+10
| | | * | MDEV-5053 - fix cyclic dependency when building with Ninja CMake generatorVladislav Vaintroub2013-09-231-1/+8
| * | | | simplify CMakeLists.txt for cassandra/connect enginesSergei Golubchik2013-09-252-3/+10
| * | | | 10.0-base merge.Sergei Golubchik2013-09-218-19/+117
| |\ \ \ \ | | |/ / /
| | * | | 5.5.33a mergeSergei Golubchik2013-09-201-3/+12
| | |\ \ \ | | | |/ /