summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-02-031-2/+8
|\
| * Merge 10.1 into 10.1Marko Mäkelä2019-02-021-2/+8
| |\
| | * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-2/+8
| | |\
| | | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-2/+8
* | | | fix RHEL8 "ambiguous python shebang" build failuresSergei Golubchik2019-01-031-0/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-1/+1
| | | |\
| | | | * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-091-1/+7
| | | | * Bug #25436469: BUILDS ARE NOT REPRODUCIBLETor Didriksen2017-05-161-0/+30
* | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-251-0/+6
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-191-0/+6
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-06-211-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2018-06-211-4/+0
| | |\ \ \ | | | |/ /
| | | * | Revert "MDEV-16075: Workaround to run MTR test suite for make test"Sergei Golubchik2018-06-201-4/+0
| * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-0/+4
| | |\ \ \ | | | |/ /
| | | * | MDEV-16075: Workaround to run MTR test suite for make testTeodor Mircea Ionita2018-06-101-0/+4
* | | | | fix debian packaging for tokudbSergei Golubchik2018-06-241-1/+1
* | | | | CMake : Move INNODB_DISALLOW_WRITES from top-level CMakeLists.txt to innodbVladislav Vaintroub2018-04-011-7/+1
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-02-221-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-14541 - Workaround GCC ICE on ARM64Sergey Vojtovich2018-02-191-0/+1
* | | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | compiler warning (signed/unsigned comparison)Sergei Golubchik2018-02-021-2/+2
* | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-191-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Build improvements and cleanups.Vladislav Vaintroub2017-09-081-0/+6
* | | | | don't install same files twiceSergei Golubchik2017-08-141-1/+0
* | | | | cmake: update submodules automatically during the buildSergei Golubchik2017-08-141-1/+1
* | | | | 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
|\ \ \ \ \ \ | |/ / / / /