summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* don't enable SECURITY_HARDENED on old gccSergei Golubchik2014-10-011-1/+6
* cleanup: galera merge, simple changesSergei Golubchik2014-10-011-3/+4
* MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+11
* MDEV-5730 enhance security using special compilation optionsSergei Golubchik2014-06-261-0/+2
* MDEV-5730 enhance security using special compilation optionsSergei Golubchik2014-06-261-0/+14
* cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG.Sergei Golubchik2014-06-261-65/+10
* cmake GUI cleanupSergei Golubchik2014-06-231-5/+2
* Merge branch '10.0' into 10.1Sergei Golubchik2014-06-131-1/+6
|\
| * 5.5.38 mergeSergei Golubchik2014-06-061-1/+6
| |\
| | * cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;Sergei Golubchik2014-06-031-0/+5
| | * MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file...Sergei Golubchik2014-05-311-1/+1
* | | set version to 10.1.0Sergei Golubchik2014-05-251-2/+2
* | | Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1Sergei Golubchik2014-05-251-10/+13
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-05-091-10/+13
| |\ \ | | |/
| | * fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ t...Sergei Golubchik2014-05-051-1/+4
| | * 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
* | | | split README into the actual README and third-party licensesSergei Golubchik2014-05-241-1/+1
* | | | remove now-obsolete "5.5+5.6 merge" TODO fileSergei Golubchik2014-05-241-1/+1
|/ / /
* | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-1/+3
* | | 10.0-base mergeSergei Golubchik2014-02-261-1/+9
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-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
* | | | Automatic mergeMichael Widenius2014-02-051-0/+1
|\ \ \ \
| * | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-0/+1
* | | | | 10.0-base mergeSergei Golubchik2014-02-031-0/+80
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-011-0/+75
| |\ \ \ | | |/ /
| | * | 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
| * | | Adding a new command into CMakeLists.txt:Alexander Barkov2014-01-311-0/+5
* | | | 10.0-base mergeSergei Golubchik2013-12-161-0/+6
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-0/+6
| |\ \ \ | | |/ /
| | * | set CMP0022 policy to avoid cmake warningsSergei Golubchik2013-11-201-0/+6
* | | | remove unused libevent (that was merged from 5.6 by mistake)Sergei Golubchik2013-11-211-3/+0
* | | | 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