summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* mergeSergei Golubchik2012-04-051-1/+1
|\
| * mergeSergei Golubchik2012-04-051-1/+1
| |\
| | * mysql-5.1.62 mergeSergei Golubchik2012-04-051-1/+1
| | |\
| | | * Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | |\
* | | | \ 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-1/+2
| | |\ \ \ | | | |/ /
| | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-1/+2
* | | | | 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/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+1
| | |\ \ \ | | | |/ /
| | | * | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | | * Merged from 5.0 (enterprise).Chad MILLER2008-12-171-12/+3
| | | | |\
| | | | * \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| | | | |\ \
| | | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-10-101-0/+1
| | | | |\ \ \
| | | | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+1
| | | | | |\ \ \
| | | | | | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+1
| | | | | | |\ \ \
| | | | | | | * | | backport vista manifest patchunknown2007-04-301-0/+5
| | | | | | | * | | Use correct filename for profiling code.unknown2007-02-221-1/+1
| | | | | | | * | | Add profiling source file to cmake file.unknown2007-02-221-0/+1
* | | | | | | | | | merging.Alexey Botchkov2011-11-121-1/+3
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ mergeSergei Golubchik2011-10-111-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | merge with 5.1Sergei Golubchik2011-10-071-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | disable feedback plugin by default. Now on windows too.Sergei Golubchik2011-10-061-1/+3
* | | | | | | | | | | Precise GIS functions added.Alexey Botchkov2011-05-041-0/+1
|/ / / / / / / / / /
* | | | | | | | | | merge mwl#55Vladislav Vaintroub2011-03-111-35/+122
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | merge 5.2Vladislav Vaintroub2011-03-101-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move common functionality (analyze service configuration) into winservice lib...Vladislav Vaintroub2011-01-301-1/+4
| * | | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-35/+118
* | | | | | | | | | | Merge with 5.2Michael Widenius2011-03-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Fixed build failuresMichael Widenius2011-02-231-1/+1
* | | | | | | | | | Bug#53240 :Fixed dependency to prevent occasional situationsVladislav Vaintroub2011-02-211-2/+1
* | | | | | | | | | Merge DS-MRR/CPK improvements into 5.3-mainSergey Petrunya2010-12-131-0/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge maria-5.3-mwl128 -> maria-5.2-mwl128-dsmrr-cpkSergey Petrunya2010-11-291-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Better comments, move Lifo_buffer to separate file.Sergey Petrunya2010-09-281-0/+1
* | | | | | | | | | | | | Merge.Igor Babaev2010-12-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Got the declarations related to the class JOIN_CACHE, its derivatives andIgor Babaev2010-11-191-1/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | mergeVladislav Vaintroub2010-12-061-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | mergeVladislav Vaintroub2010-12-061-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-5/+1
* | | | | | | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge with 5.1Michael Widenius2010-12-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+1
* | | | | | | | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fixes for buildbotSergei Golubchik2010-07-251-0/+1