summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* merge mwl#55Vladislav Vaintroub2011-03-111-1/+2
|\
| * merge 5.2Vladislav Vaintroub2011-03-101-1/+1
| |\
| * | Move common functionality (analyze service configuration) into winservice lib...Vladislav Vaintroub2011-01-301-0/+1
| * | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-1/+1
* | | Merge with 5.2Michael Widenius2011-03-091-1/+1
|\ \ \ | | |/ | |/|
| * | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ | | |/ | |/|
| | * Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | |\
| | | * Bug#57210: remove pstackDavi Arnaut2010-11-091-1/+0
* | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-1/+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-0/+1
| |\ \ \ \
| * \ \ \ \ 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-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Got the declarations related to the class JOIN_CACHE, its derivatives andIgor Babaev2010-11-191-0/+1
| |/ / / / /
* | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge MariaDB 5.1->5.2unknown2010-11-191-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MWL#74: Shared libmysqld.so library.unknown2010-11-171-1/+1
* | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-3/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | merge with 5.1Sergei Golubchik2010-09-111-3/+0
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+0
| | |\ \ | | | |/
* | | | Subquery cache (MWL#66) added.unknown2010-07-101-2/+3
* | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-7/+10
|\ \ \ \ | |/ / /
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-2/+3
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-5/+7
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-1/+3
|\ \ \ \ | |/ / /
| * | | mwl:98 - libservicesSergei Golubchik2010-03-031-1/+1
| |/ /
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+2
| |\ \ | | |/
| | * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+2
* | | Subquery optimization backport:Sergey Petrunya2010-02-161-1/+3
* | | - Make testcase work for both debug and releaseSergey Petrunya2009-12-221-1/+1
* | | Merge MWL#67: MRR Backport and BKA backport.Sergey Petrunya2009-12-221-0/+1
|\ \ \
| * | | Backport into MariaDB-5.2 the following:Igor Babaev2009-12-201-0/+1
* | | | MWL#67: MRR backportSergey Petrunya2009-12-221-4/+7
|/ / /
* | | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-2/+2
|/ /
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+3
|\ \
| * \ Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-1/+1
| |\ \
| | * | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-1/+1
| * | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+2
| |/ /
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+1
|\ \ \ | |/ / |/| / | |/
| * Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\
| | * Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1
| | * Merged from 5.0 (enterprise).Chad MILLER2008-12-171-1/+2
| | |\
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+2
| | |\ \
| | | * \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+2
| | | |\ \
* | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-2/+3
|/ / / / /
* | | | | merge fix for Bug40280 from 5.0Vladislav Vaintroub2008-10-231-2/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.Vladislav Vaintroub2008-10-231-1/+2
| |/ / /
* | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-181-2/+2
* | | | Bug#35997 Event scheduler seems to let the server crash, if it is embedded.unknown2008-05-091-2/+3