summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+7
* 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
| |\ \ | | |/
* | | merge with mysql-5.5.21Sergei Golubchik2012-03-091-1/+13
|\ \ \ | |/ /
| * | Bug#13551687 CMAKE GENERATED PROJECT FILES ALWAYS HAVE THE SAME NAME IN VISUA...Tor Didriksen2012-01-161-1/+12
* | | Merge MWL#192: non-blocking client library into MariaDB.unknown2012-02-261-1/+1
|\ \ \
| * \ \ Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-1/+1
| |\ \ \
* | | | | disable safemalloc for valgrind builds.Sergei Golubchik2012-02-231-1/+1
|/ / / /
* | | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \
| * \ \ \ Merge with 5.2.Michael Widenius2011-12-111-1/+2
| |\ \ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-1/+2
| | |\ \ \ \
| | | * \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+2
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | | | |\ \ \
| | | | * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | | | |\ \ \ \
| | | | | * | | | Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | | | * | | | Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.eKent Boortz2009-12-111-0/+1
| * | | | | | | | mergeVladislav Vaintroub2011-10-121-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Add option to enable feedback plugin to the MSI installer.Vladislav Vaintroub2011-10-121-0/+2
| * | | | | | | | mergeVladislav Vaintroub2011-10-111-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | mergeVladislav Vaintroub2011-10-111-3/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | remove unconditional SAFEMALLOC/SAFEMUTEX from debug flagsVladislav Vaintroub2011-10-111-3/+0
| * | | | | | | | mergeSergei Golubchik2011-10-111-21/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | merge with 5.1Sergei Golubchik2011-10-071-21/+27
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | support for plugins on windowsSergei Golubchik2011-10-041-21/+27
| | | * | | | | Windows build : Make win\config.js optional in 5.1Vladislav Vaintroub2011-05-121-1/+92
* | | | | | | | * remove WITH_DEBUG from CMakeLists.txtSergei Golubchik2011-12-151-79/+58
* | | | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-2/+9
* | | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+6
* | | | | | | | build on windowsSergei Golubchik2011-11-021-6/+1
* | | | | | | | Fix debug build on Windows. Vladislav Vaintroub2011-10-251-3/+5