summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-7/+5
|\
| * Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-7/+5
| |\
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-8/+5
| | |\
| | | * Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-8/+5
| | | |\
| | | | * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-5/+3
| | | | * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-3/+2
| | | | * Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-4/+11
| | | | * Updated CMakeLists.txt to include rpm-docker directoryBalasubramanian Kandasamy2015-06-161-1/+2
* | | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-311-4/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-211-2/+1
| | | |\ \ \ | | | | |/ /
| | | | * | remove COPYING.LESSERSergei Golubchik2017-03-211-2/+1
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-0/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-0/+3
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMA...Sergei Golubchik2017-02-271-0/+3
| | | | * | Fix warnings on Windows, compiler option -ggdb3 option is nonexistentVladislav Vaintroub2016-05-241-2/+4
| * | | | | MDEV-11059 don't build the server with jemallocSergei Golubchik2017-03-291-3/+1
* | | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-111-7/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-11708 cmake -DWITH_ASAN no longer worksSergei Golubchik2017-01-291-6/+6
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2017-01-101-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-01-101-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Windows : use meaningful DEFAULT_MYSQL_HOME - base directoryVladislav Vaintroub2017-01-061-1/+1
* | | | | | MariaRocks port: fix the build: fetch git submodules earlierSergei Petrunia2017-01-111-1/+4
|/ / / / /
* | | | | Merge pull request #253 from grooverdan/10.2-MDEV-11195-numa-buildVladislav Vaintroub2016-11-041-1/+0
|\ \ \ \ \
| * | | | | MDEV-11195: Correct enablement of NUMA in innodb/xtradbDaniel Black2016-11-011-1/+0
* | | | | | MDEV-6284: Install systemd files (almost) the Debian wayOtto Kekäläinen2016-10-291-6/+0
* | | | | | MDEV-6284: Revert commit af03ba84 partially for systemdOtto Kekäläinen2016-10-271-0/+6
* | | | | | MDEV-6284: Remove CMakeLists.txt hack that mangled the server install fileOtto Kekäläinen2016-10-271-6/+0
* | | | | | MDEV-6284: Rename .files -> .installOtto Kekäläinen2016-10-271-2/+2
|/ / / / /
* | | | | Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server into...Jan Lindström2016-10-241-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge 10.2Daniel Black2016-09-231-1/+9
| |\ \ \ \ \
| * | | | | | MDEV-10829: Enable Innodb NUMA interleaveDaniel Black2016-09-231-0/+1
* | | | | | | MDEV-9143 JSON_xxx functions.Alexey Botchkov2016-10-191-0/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-211-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-10412 fix WITH_ASAN option for 10.1Rik Prohaska2016-07-241-0/+4
| * | | | | Markdown README for a prettier github representationDaniel Black2016-08-241-1/+1
* | | | | | auto-clone C/C, if possibleSergei Golubchik2016-09-121-0/+5
* | | | | | Add C/C as a submodule in libmariadb/Sergei Golubchik2016-09-121-2/+1
* | | | | | Set cmake policy CMP0054 NEWSergei Golubchik2016-09-041-0/+3
* | | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-251-0/+1
|/ / / / /
* | | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-191-1/+0
* | | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-191-0/+1
* | | | | MDEV-9872 - Add common optimized CRC32 function interfaceSergey Vojtovich2016-08-041-0/+1
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-251-9/+8
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9601 Build client plugins, also for the cmake client-only buildVladislav Vaintroub2016-02-221-9/+8
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute pathsSergey Vojtovich2015-12-221-1/+1
* | | | | MDEV-8111 - remove "fast mutexes"Sergey Vojtovich2015-11-261-7/+0