summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-11-131-6/+0
|\
| * 5.5. mergeSergei Golubchik2013-11-131-0/+6
| |\
| | * MDEV-5038 put tokudb into the server packageSergei Golubchik2013-11-111-0/+6
* | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-1/+1
|\ \ \ | |/ /
| * | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-1/+1
* | | Added information about the MariaDB foundationMichael Widenius2013-09-231-1/+2
* | | 10.0-base merge.Sergei Golubchik2013-09-211-9/+13
|\ \ \ | |/ /
| * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-9/+13
| |\ \ | | |/
| | * merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-101-8/+9
| | |\
| | | * INSTALL_DOCUMENTATION function for CMakeLists.txtSergei Golubchik2013-09-101-8/+6
| | | * start using jemallocSergei Golubchik2013-08-301-0/+3
| | * | mysql-5.5.33 mergeSergei Golubchik2013-09-061-0/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge from 5.5 to 5.6Chaithra Gopalareddy2013-05-231-0/+1
| | | |\
| | | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | * | | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable optionSergei Golubchik2013-08-171-1/+3
* | | | | 10.0-monty mergeSergei Golubchik2013-07-211-2/+7
|\ \ \ \ \
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+7
* | | | | | 10.0-base mergeSergei Golubchik2013-07-181-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.5 mergeSergei Golubchik2013-07-171-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-2/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Bug 16534721 - MYSQL_INSTALL_DB RUNS AGAIN DURING UPGRADE EVEN DATA DIRECTORY...Murthy Narkedimilli2013-04-031-1/+2
| | | * | | Placement change:Joerg Bruehe2012-11-071-1/+1
* | | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if...Vladislav Vaintroub2013-04-301-1/+1
* | | | | | ha_cassandra.so and ha_oqgraph.so can be build only if boost is installedAlexander Barkov2013-04-251-0/+12
|/ / / / /
* | | | | 5.5 mergeSergei Golubchik2013-03-271-5/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | make rpm packages to respect CMAKE_INSTALL_PREFIXSergei Golubchik2013-02-081-5/+1
* | | | 5.5 mergeSergei Golubchik2013-01-291-0/+2
|\ \ \ \ | |/ / /
| * | | mysql-5.5.29 mergeSergei Golubchik2013-01-151-0/+2
| |\ \ \
| | * | | Placement change:Joerg Bruehe2012-11-081-1/+1
| | |/ /
| | * | Merge changes for ULN RPMs into main 5.5Joerg Bruehe2012-09-211-0/+1
| | |\ \
| | | * | More changes to supporting the build of RPMs for ULNJoerg Bruehe2012-06-111-0/+1
| | * | | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILDTor Didriksen2012-09-071-0/+1
* | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | mysql-5.5.28Sergei Golubchik2012-10-161-0/+4
| |\ \ \ \ | | |/ / /
| | * | | upmerge 14035452 5.1 -> 5.5Bjorn Munch2012-07-191-0/+3
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bug #14035452 - MODULARIZE MYSQL_CLIENT_TESTBjorn Munch2012-07-191-0/+3
* | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+1
|\ \ \ \
| * \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-0/+4
| | |\ \ \
| | * | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-06-281-0/+1
* | | | | | Automatic merge with 5.5Michael Widenius2012-09-011-9/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-439 cmake -DWITHOUT_SERVER does not workSergei Golubchik2012-08-231-9/+10
| | |/ / / | |/| | |
* | | | | automatic merge with 5.5Michael Widenius2012-06-271-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaioSergei Golubchik2012-06-061-0/+4
| |/ / /
* | | | Switched off Maintainer mode by default as it gave wrong compiler warnings (a...Michael Widenius2012-06-131-6/+8
|/ / /
* | | Building RPMs with CPackSergei Golubchik2012-05-221-48/+26
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+2
|\ \ \ | |/ /
| * | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ | | |/