summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-10/+35
|\
| * 5.5 mergeSergei Golubchik2014-09-161-2/+4
| |\
| | * MDEV-6526 INFO_SRC and INFO_BIN installed wrongSergei Golubchik2014-09-121-2/+5
| * | MDEV-6565 search order for my.cnf inconsistent in docs/use, and global overri...Sergei Golubchik2014-09-101-1/+1
| * | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compilingJames Le Cuirot2014-08-151-1/+1
| * | MDEV-6562: Fix WITHOUT_SERVER buildJames Le Cuirot2014-08-111-1/+4
| * | 5.5.39 mergeSergei Golubchik2014-08-071-1/+8
| |\ \ | | |/
| | * mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+8
| | |\
| | | * Bug#19001781: ADD SUPPORT FOR CMAKE 3Jon Olav Hauglid2014-06-241-0/+8
| | | * Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLi...Balasubramanian Kandasamy2014-06-171-1/+0
| | | * Backport of:Tor Didriksen2014-03-051-0/+6
| * | | typo fixed: only use -ggdb3 when it's supported by the compilerSergei Golubchik2014-08-061-2/+4
| * | | typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and inco...Sergei Golubchik2014-07-081-7/+7
| * | | MDEV-6410 Cross-compile fixesSergei Golubchik2014-07-081-0/+12
| |\ \ \
| | * | | MySQL Bug #61340: Use CMake EXPORT feature to aid cross-compiling.James Le Cuirot2014-04-271-0/+10
* | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-111-2/+8
* | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-6/+0
* | | | | 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