summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-8/+9
|\
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-8/+9
| |\
| | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2014-01-161-11/+9
| | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2014-01-161-9/+12
* | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-1/+9
|\ \ \ | |/ /
| * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+9
| |\ \ | | |/
| | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2013-12-181-0/+9
| | * Backport 5.5.35 EL6 uln repo rpmsBalasubramanian Kandasamy2013-11-251-0/+1
* | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-0/+81
|\ \ \ | |/ /
| * | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+75
| |\ \ | | |/
| | * Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS M...Sreedhar.S2013-10-161-1/+2
| | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR...Sreedhar.S2013-10-091-20/+0
| | * Fix to copy missing pdb files BUG 13878021Sreedhar.S2013-09-301-0/+21
| | * Bug#17435338 ADD A -DWITH_ASAN SWITCH/OPTION TO OUR CMAKE SCRIPTSTor Didriksen2013-09-201-1/+77
| * | set CMP0022 policy to avoid cmake warningsSergei Golubchik2013-11-201-0/+6
* | | MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbotJan Lindström2013-12-041-2/+2
* | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-0/+6
|\ \ \ | |/ /
| * | MDEV-5038 put tokudb into the server packageSergei Golubchik2013-11-111-0/+6
* | | mariadb-5.5.33 mergeSergei 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
* | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-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
* | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if...Vladislav Vaintroub2013-04-301-1/+1
* | | | References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-5/+1
|\ \ \ \ | |/ / /
| * | | make rpm packages to respect CMAKE_INSTALL_PREFIXSergei Golubchik2013-02-081-5/+1
* | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-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
* | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-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
* | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-9/+10
|\ \ \ \ | |/ / /
| * | | MDEV-439 cmake -DWITHOUT_SERVER does not workSergei Golubchik2012-08-231-9/+10
* | | | References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-0/+4
|\ \ \ \ | |/ / /
| * | | MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaioSergei Golubchik2012-06-061-0/+4
* | | | references lp:1011983Seppo Jaakola2012-06-121-49/+26
|\ \ \ \ | |/ / /
| * | | Building RPMs with CPackSergei Golubchik2012-05-221-48/+26