summaryrefslogtreecommitdiff
path: root/libmysqld/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* MDEV-26: Global Transaction ID.unknown2013-03-111-0/+1
* 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 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
| | | | |\ \ \
* | | | | \ \ \ SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2012-06-151-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-0/+1
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | MWL#182: Explain running statementsSergey Petrunya2011-10-271-0/+1
| | | | |\ \ \ \ \
| | | | | * | | | | Fix windows build: add my_apc.{h,cc} to CMakeLists.txt filesSergey Petrunya2011-08-251-0/+1
* | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-0/+1
|/ / / / / / / / /
* | | | | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-2/+2
|/ / / / / / / /
* | | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated/added copyright headersKent Boortz2012-02-151-2/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+1
* | | | | | | | | MDEV-15 Log all sql errors.Alexey Botchkov2012-03-241-1/+0
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Fix compile error - linker does not find extern variables, in sql_logger.cVladislav Vaintroub2012-03-151-1/+1
* | | | | | | | MDEV-15 Log SQL errors.Alexey Botchkov2012-03-141-0/+1
* | | | | | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-0/+1
* | | | | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-021-0/+1
* | | | | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 5.2->5.3 mergeSergei Golubchik2011-12-121-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-1/+1
| * | | | | | | | Merge with 5.2.Michael Widenius2011-12-111-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+2
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-1/+2
* | | | | | | | | mergedSergei Golubchik2011-11-271-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid mysqld dependency on libaio.so by linking xtradb statically to libaio. Vladislav Vaintroub2011-11-251-0/+3
* | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | merging.Alexey Botchkov2011-11-121-15/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | mergeSergei Golubchik2011-10-111-15/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | merge with 5.1Sergei Golubchik2011-10-071-15/+12
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | / | | | | |_|_|/ | | | |/| | |
| | | | * | | support for plugins on windowsSergei Golubchik2011-10-041-15/+12
| * | | | | | gis-related tests fixes.Alexey Botchkov2011-06-201-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Precise GIS functions added.Alexey Botchkov2011-05-041-0/+1
* | | | | | | mergedSergei Golubchik2011-11-221-2/+1
|\ \ \ \ \ \ \
| * | | | | | | few cmake/compiler warningsSergei Golubchik2011-11-031-2/+1