summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0.14 into 10.1Sergei Golubchik2014-10-157-127/+108
|\
| * 5.5 mergeSergei Golubchik2014-09-182-7/+20
| |\
| | * support statically linked jemalloc. use that for release buildsSergei Golubchik2014-09-182-6/+17
| * | 5.5 mergeSergei Golubchik2014-09-163-92/+48
| |\ \ | | |/
| | * MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu)Sergei Golubchik2014-09-122-53/+12
| | * MDEV-6561 libedit detection is brokenSergei Golubchik2014-09-092-38/+36
| * | mergeSergei Golubchik2014-08-083-32/+44
| |\ \
| | * \ 5.5.39 mergeSergei Golubchik2014-08-073-32/+44
| | |\ \ | | | |/
| | | * mysql-5.5.39 mergeSergei Golubchik2014-08-023-32/+44
| | | |\
| | | | * Backport from trunk:Tor Didriksen2014-05-072-15/+31
| | | | * Backport from trunk:Tor Didriksen2014-05-051-20/+23
| * | | | MDEV-6118: Unable to install "MariaDB-connect-engine" whenNirbhay Choubey2014-08-061-1/+1
| |/ / /
* | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-112-3/+80
* | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-113-23/+1
* | | | portability: use getifaddrs()Sergei Golubchik2014-10-011-0/+1
* | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-013-51/+24
* | | | bugfix: disabling partitioning in already built treeSergei Golubchik2014-10-011-2/+1
* | | | cleanup: remove libedit, move readline to extra/Sergei Golubchik2014-10-011-2/+2
* | | | wsrep-related changes: removed some unnecessary files & minor modifications.Nirbhay Choubey2014-09-251-4/+1
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-273-5/+100
|\ \ \ \
| * | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-263-5/+100
* | | | | Changes for using build scriptsMonty2014-08-091-1/+1
|/ / / /
* | | | MDEV-6354: Implement a way to read MySQL 5.7.4-labs-tplc pageJan Lindström2014-07-222-0/+50
* | | | cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG.Sergei Golubchik2014-06-263-2/+51
* | | | cmake: prefer INSTALL(PROGRAMS over INSTALL(FILESSergei Golubchik2014-06-261-7/+1
* | | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Jan Lindström2014-06-254-89/+82
|\ \ \ \
| * | | | MDEV-6248 GUI-friendly cmake options to enable/disable pluginsSergei Golubchik2014-06-232-87/+78
| * | | | cmake GUI cleanupSergei Golubchik2014-06-231-0/+2
| * | | | Fix CMakeLists.txt for cmake Ninja generatorSergei Golubchik2014-06-202-2/+2
* | | | | MDEV-6361: innodb_compression_algorithm configuration variable canJan Lindström2014-06-251-4/+4
|/ / / /
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2014-06-131-1/+2
|\ \ \ \ | |/ / /
| * | | 5.5.38 mergeSergei Golubchik2014-06-061-1/+2
| |\ \ \ | | |/ /
| | * | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;Sergei Golubchik2014-06-031-1/+2
* | | | Merge remote-tracking branch 'origin/10.1' into 10.1-serg-mergeSergei Golubchik2014-05-261-5/+5
|\ \ \ \
| * \ \ \ merge the compilation fixes from 10.0-FusionIOSergei Golubchik2014-05-261-5/+5
| |\ \ \ \
| | * | | | temporarily disable lzo compressionSergei Golubchik2014-05-261-4/+4
| | * | | | lzo.cmake: don't use the same symbol for two different testsSergei Golubchik2014-05-261-2/+2
* | | | | | Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1Sergei Golubchik2014-05-255-11/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.0 -> 10.1Jan Lindström2014-05-245-11/+18
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-05-095-11/+18
| | |\ \ \ | | | |/ /
| | | * | MDEV-5081 - Simple performance improvement for MariaDBSergey Vojtovich2014-02-281-3/+0
| | | * | don't install mysql-test/var and cmake internal filesSergei Golubchik2014-04-141-2/+4
| | | * | MDEV-6004 MariaDB init script fails to start (missing dependency on MariaDB-c...Sergei Golubchik2014-04-081-3/+7
| | | * | line endingsSergei Golubchik2014-04-081-8/+8
| | | * | MDEV-6016 Packaging error with cmake 2.8.12 and greaterElena Stepanova2014-04-031-1/+5
| | | * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-272-2/+2
| | | |\ \ | | | | |/
| | | | * Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARISTor Didriksen2014-02-251-1/+2
| | | | * Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18Tor Didriksen2014-01-232-11/+12
* | | | | git support in cmake filesSergei Golubchik2014-05-243-5/+34
* | | | | remove support for per-plugin bzr repositoriesSergei Golubchik2014-05-242-24/+0
|/ / / /