summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* speedup RPM buildsSergei Golubchik2019-04-021-0/+2
* MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-271-11/+3
* MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-272-2/+41
* MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-271-1/+20
* cmake: don't do fake rpm ProvidesSergei Golubchik2019-03-271-30/+6
* cmake: fix cpack_source_ignore_filesSergei Golubchik2019-03-271-9/+11
* cmake: remove workarounds for cmake bugs #13248 and #12864Sergei Golubchik2019-03-271-3/+0
* cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-271-2/+7
* MDEV-17703 Add WITH_UBSAN switch to CMake similar to WITH_ASANEugene Kosov2019-03-112-2/+2
* Fix the WITH_ASAN clang build of dynamic pluginsMarko Mäkelä2019-03-071-1/+1
* Don't build aws_key_management plugin by defaultSergei Golubchik2019-02-191-1/+1
* Merge 10.1 into 10.1Marko Mäkelä2019-02-022-2/+9
|\
| * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+0
| |\
| | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-1/+0
| * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+10
| |\ \ | | |/
| | * MDEV-17615 cmake ssl error on musl/libresslSergei Golubchik2019-01-211-1/+9
* | | Merge branch '10.0-galera' into 10.1Oleksandr Byelkin2019-01-311-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/10.0' into 10.0-galeraJan Lindström2018-11-021-2/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-10-305-22/+18
| |\ \ \ \
| | * \ \ \ Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62Jan Lindström2018-10-294-21/+17
| | |\ \ \ \
| | * | | | | Bump WSREP_PATCH_VERSIONVasil Dimov2018-10-101-1/+1
| | * | | | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-191-0/+1
| | |\ \ \ \ \
| | * | | | | | MW-406 Bumped up the wsrep patch version (5.5.57-25.22)Teemu Ollakka2017-10-191-1/+1
| | * | | | | | MW-383 Bumped wsrep patch versionTeemu Ollakka2017-07-201-1/+1
| | * | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-202-4/+10
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-031-0/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-183-0/+32
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Bump WSREP_PATCH_VERSION to 20Sachin Setiya2017-04-181-1/+1
| | * | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-273-1/+3
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-134-8/+17
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-02-101-1/+1
| | * | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 14Philip Stoev2016-02-101-1/+1
| | * | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13Philip Stoev2016-02-101-1/+1
| | * | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-023-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2018-12-291-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-12-201-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Don't default to bundled zlibSergei Golubchik2018-12-171-5/+0
* | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-311-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-311-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | don't try to build with OpenSSL 1.1+Sergei Golubchik2018-10-301-1/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-304-21/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-274-21/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-232-14/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#28200422 USE CTAGS RATHER THAN ETAGS FOR GENERATING TAGS FILETor Didriksen2018-07-191-9/+26
| | | * | | | | | | | | | | | Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-092-15/+6
| | * | | | | | | | | | | | | Fix cmake warningVladislav Vaintroub2018-10-101-3/+2