summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge ../10.1-explain-json-r4 into 10.1Sergei Petrunia2014-11-271-0/+1
|\
| * Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-151-0/+23
| |\
| * \ 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
* | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-6/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Automatic merge from 5.5Michael Widenius2014-08-191-11/+10
| |\ \ \
| | * | | MDEV-5706 MariaDB does not build on hurd-i386Sergei Golubchik2014-08-121-11/+10
| | * | | MDEV-5706 MariaDB does not build on hurd-i386Sergei Golubchik2014-07-251-1/+9
| * | | | MDEV-5756 CMake option to build without thread pool.Alexey Botchkov2014-07-221-1/+9
| * | | | MDEV-6410 Cross-compile fixesSergei Golubchik2014-07-081-1/+3
| |\ \ \ \
| | * | | | MySQL Bug #61340: Use CMake EXPORT feature to aid cross-compiling.James Le Cuirot2014-04-271-1/+3
* | | | | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-0/+2
* | | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-1/+0
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+22
| |_|_|/ / |/| | | |
* | | | | remove unused sql/examplesSergei Golubchik2014-06-261-1/+0
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2014-06-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Moving implementation of INET_ATON() INET_NTOA() intoAlexander Barkov2014-05-301-1/+1
* | | | | Amend "make distclean" message to mention "git clean -Xdf"Sergei Petrunia2014-06-041-0/+1
| |_|_|/ |/| | |
* | | | Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1Sergei Golubchik2014-05-251-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-05-091-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Added new states to be able to better diagnose where server hangs.Michael Widenius2014-05-031-1/+1
* | | git support in cmake filesSergei Golubchik2014-05-241-1/+1
|/ /
* | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
* | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| |\ \ | | |/
| | * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | |\
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-1/+1
| |\ \ \
| | * | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate...unknown2013-06-241-1/+1
* | | | | 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/DELETE, code re-structuringSergey Petrunya2013-06-271-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | SHOW EXPLAIN UPDATE/DELETESergey Petrunya2013-06-171-0/+1
* | | | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4425Alexander Barkov2013-10-021-0/+1
| * | | | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-2/+2
* | | | | | merge 10.0-base -> 10.0unknown2013-09-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge 5.5 -> 10.0-baseunknown2013-09-251-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | MDEV-5053 - fix cyclic dependency when building with Ninja CMake generatorVladislav Vaintroub2013-09-231-1/+1
* | | | | | 10.0-base merge.Sergei Golubchik2013-09-211-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+2
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | cmake fixes for tokudbSergei Golubchik2013-09-091-2/+2
| | * | | start using jemallocSergei Golubchik2013-08-301-1/+1
* | | | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-0/+1
* | | | | 10.0-monty mergeSergei Golubchik2013-07-211-5/+6
|\ \ \ \ \
| * | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+2
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-4/+4
* | | | | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-101-1/+1