summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+5
| |\ \ | | |/
| | * Implement an NSIS based installerBo Thorsen2010-06-251-0/+5
| * | Make MariaDB compile with VS 2010Hakan Kuecuekyilmaz2010-06-241-1/+0
* | | Subquery cache (MWL#66) added.unknown2010-07-101-0/+1
* | | Add sql/opt_index_cond_pushdown.cc to CMakeLists.txt filesSergey Petrunya2010-06-271-0/+1
* | | Fix windows build: add sql/opt_subselect.cc to CMakeLists.txt filesSergey Petrunya2010-06-271-0/+1
* | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-4/+5
|\ \ \ | |/ /
| * | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+2
| |\ \ | | |/
| | * Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+2
| | |\
| | | * Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be...Vladislav Vaintroub2010-04-261-2/+2
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+1
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+1
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-2/+3
|\ \ \ \ | |/ / /
| * | | mwl:98 - libservicesSergei Golubchik2010-03-031-1/+1
| |/ /
| * | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-1/+1
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+1
| |\ \ | | |/
| | * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+1
* | | Backport into MariaDB-5.2 the following:Igor Babaev2009-12-201-3/+4
* | | Add ds_mrr.cc to CMakeLists.txtSergey Petrunya2009-12-161-0/+1
|/ /
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-3/+3
|\ \
| * \ MergeSergey Petrunya2009-09-021-2/+3
| |\ \
| | * | Trivial fixes for windows compile failuresSergey Petrunya2009-09-011-2/+3
| * | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+1
| |/ /
| * | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-12/+2
| |\ \
| * \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+3
| |\ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-2/+2
| |\ \ \ \
| * | | | | Windows fixesunknown2008-01-101-0/+3
* | | | | | MySQL 5.1 -> MariaDB 5.1 merge: windows build fixesSergey Petrunya2009-09-151-1/+2
| |_|_|_|/ |/| | | |