summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.6 into 10.7Marko Mäkelä2022-04-261-3/+1
|\
| * Merge 10.5 into 10.6Marko Mäkelä2022-04-211-3/+1
| |\
| | * Merge 10.4 into 10.5Marko Mäkelä2022-04-211-3/+1
| | |\
| | | * Merge 10.3 into 10.4Marko Mäkelä2022-04-211-3/+1
| | | |\
| | | | * MDEV-27834 Incorrect provides of MariaDB-shared for CentOS8Sergei Golubchik2022-04-121-3/+1
* | | | | Merge 10.6 into 10.7Marko Mäkelä2022-03-111-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.5 into 10.6Marko Mäkelä2022-03-111-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.4 into 10.5Marko Mäkelä2022-03-111-1/+3
| | |\ \ \ | | | |/ /
| | | * | Explicitly specify that we use the C99 dialectMarko Mäkelä2022-03-101-1/+3
* | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-02-041-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-02-031-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-02-011-0/+4
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-301-0/+4
| | | |\ \ | | | | |/
| | | | * Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-291-0/+4
| | | | |\
| | | | | * MDEV-14938 make buildbot to include galera into bintarsSergei Golubchik2022-01-071-0/+1
| | | * | | Add new option NOT_EMBEDDED, for pluginsVladislav Vaintroub2021-11-091-1/+1
| | | * | | Merge branch '10.3' into 10.4Vladislav Vaintroub2021-09-111-0/+37
| | | |\ \ \ | | | | |/ /
* | | | | | MDEV-12933 sort out the compression library chaosKartik Soneji2021-10-271-1/+2
* | | | | | Merge 10.6 into 10.7Marko Mäkelä2021-10-221-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-181-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Made optional Json_writer_object / Json_writer_array consistency checkSergei Krivonos2021-10-171-0/+4
| | * | | | Use mariadb- named targets for minbuildVladislav Vaintroub2021-09-111-15/+16
| | * | | | Merge branch '10.4' into 10.5Vladislav Vaintroub2021-09-111-0/+37
| | |\ \ \ \
| | | * \ \ \ Merge branch '10.3' into 10.4Vladislav Vaintroub2021-09-111-0/+37
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ /
| | | | * | Merge branch '10.2' into 10.3Vladislav Vaintroub2021-09-111-0/+37
| | | | |\ \ | | | | | |/
| | | | | * Define minbuild target for 10.2Vladislav Vaintroub2021-09-111-0/+37
* | | | | | MDEV-25015 Custom formatting of strings in MariaDB queriesAlan Cueva2021-10-121-0/+2
|/ / / / /
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-111-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'upstream/10.4' into 10.5Vicențiu Ciorbaru2021-09-101-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'upstream/10.3' into 10.4Vicențiu Ciorbaru2021-09-091-1/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-09-071-1/+2
| | | |\ \ | | | | |/
| | | | * disable cmake feature summary after the first runSergei Golubchik2021-09-061-1/+2
* | | | | MDEV-26527 speedup appveyor buildVladislav Vaintroub2021-09-061-16/+43
* | | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2021-08-021-5/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2021-07-311-5/+16
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-311-5/+16
| | |\ \ \ | | | |/ /
| | | * | Merge 10.2 into 10.3Marko Mäkelä2021-07-221-5/+16
| | | |\ \ | | | | |/
| | | | * Add feature summary at the end of cmake.Heinz Wiesinger2021-07-211-3/+14
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-05-261-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-261-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-251-0/+2
| | |\ \ \ | | | |/ /
| | | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-241-0/+2
| | | |\ \ | | | | |/
| | | | * cmake: fewer Build-Depends in SRPMSergei Golubchik2021-05-221-0/+2
* | | | | Flush gcov files for DBUG_ASSERT and DBUG_SUICIDEMonty2021-05-241-1/+1
* | | | | Fixes that enables my_new.cc (new wrapper using my_malloc)Monty2021-05-191-1/+2
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-05-101-11/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-101-11/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-101-11/+12
| | |\ \ \ | | | |/ /
| | | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-101-11/+12
| | | |\ \ | | | | |/
| | | | * MDEV-25232 Ninja MSVC build sets default CMAKE_BUILD_TYPE to DebugVladislav Vaintroub2021-05-091-11/+12