summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* 5.2 merge.Sergei Golubchik2012-08-221-0/+1
|\
| * 5.1 mergeSergei Golubchik2012-08-221-0/+1
| |\
| | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+1
| | |\
| | | * new header file must be listed in Makefile.amTor Didriksen2012-04-181-0/+1
* | | | MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-04-231-1/+2
* | | | 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-0/+1
| | |\ \ \ | | | |/ /
| | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+1
* | | | | Merge with 5.2.Michael Widenius2011-12-111-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+2
| | |\ \ \ | | | |/ /
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
| * | | | Fix error in "make dist" (sql/CMakeLists.txt is not delivered in source distr...Vladislav Vaintroub2011-04-031-1/+1
* | | | | forgotten h-files added to the NOINST_HEADERSAlexey Botchkov2011-05-051-1/+2
* | | | | Precise GIS functions added.Alexey Botchkov2011-05-041-0/+2
* | | | | 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