summaryrefslogtreecommitdiff
path: root/libmysqld/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-3/+7
|\
| * Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-3/+7
| |\
| | * Restore COMPONENT Embedded for Windows embedded libs.Vladislav Vaintroub2016-05-241-3/+7
* | | MDEV-6080: Allowing storage engine to shortcut group by queriesMonty2015-10-051-0/+1
* | | MDEV-8865 Wrong field type or metadata for COALESCE(signed_int_column, unsign...Alexander Barkov2015-09-301-0/+1
* | | MDEV-8126 encryption for temp filesSergei Golubchik2015-06-021-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ \ | |/ /
| * | perfschema 5.6.24Sergei Golubchik2015-05-051-1/+1
* | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Sergei Petrunia2015-04-121-1/+1
|\ \ \
| * | | renames to follow single consistent naming styleSergei Golubchik2015-04-091-1/+1
* | | | MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BYSergei Petrunia2015-04-121-0/+1
|/ / /
* | | encryption key management plugin apiSergei Golubchik2015-02-101-1/+1
* | | Push for testing of encryptionMonty2015-02-101-1/+0
* | | Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-151-0/+1
|\ \ \
| * | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-0/+1
| |/ /
* | | Merge 10.1 (with ANALYZE) and 10.1-explain-jsonSergei Petrunia2014-08-091-0/+1
|\ \ \ | |/ / |/| |
| * | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-271-0/+1
* | | Moving implementation of INET_ATON() INET_NTOA() intoAlexander Barkov2014-05-301-0/+1
|/ /
* | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
* | 10.0-base mergeSergei Golubchik2013-12-161-0/+2
|\ \
| * \ 5.5 mergeSergei Golubchik2013-12-151-0/+2
| |\ \ | | |/
| | * install embedded_priv.h in ${INSTALL_INCLUDEDIR}/privateSergei Golubchik2013-12-061-0/+2
* | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-0/+1
|\ \ \ | |/ /
| * | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-0/+1
| |\ \
| | * | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-051-1/+1
| | * | SHOW EXPLAIN UPDATE/DELETESergey Petrunya2013-06-171-0/+1
* | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-2/+3
|\ \ \ \ | |/ / /
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-021-0/+1
| * | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-2/+2
| |/ /
* | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-0/+1
* | | 10.0-monty mergeSergei Golubchik2013-07-211-2/+3
|\ \ \
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-2/+3
* | | | Building libmysqld fixed.unknown2013-07-161-0/+1
* | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | MDEV-26: Global Transaction ID.unknown2013-03-111-0/+1
* | | 10.0-base mergeSergei Golubchik2013-01-311-1/+14
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-01-291-1/+14
| |\ \ | | |/
| | * fix embedded build with for cmake 2.6.2 (older cmake could not handle IF(NOT ...Vladislav Vaintroub2013-01-281-1/+3
| | * fix embeddedVladislav Vaintroub2013-01-251-1/+0
| | * Fix embedded buildVladislav Vaintroub2013-01-251-3/+4
| | * MDEV-3842, MDEV-3923 :Vladislav Vaintroub2013-01-251-1/+12
* | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+2
|\ \ \ | |/ /
| * | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-1/+2
| |\ \
| | * \ MergeIgor Babaev2012-06-011-2/+2
| | |\ \ | | | |/
| | * | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-2/+1
| | |\ \
| | * \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-1/+2
| | |\ \ \
| | | * \ \ Merge with MariaDB 5.2Michael Widenius2012-02-211-0/+1
| | | |\ \ \
| | | | * \ \ Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-0/+1
| | | | |\ \ \
| | | | | * \ \ Merge with MYSQL 5.1.61Michael Widenius2012-02-201-0/+1
| | | | | |\ \ \
* | | | | | \ \ \ 10.0-base -> 10.0-montySergei Golubchik2012-10-191-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /