summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.2->5.3Sergey Petrunya2010-10-103-4/+6
|\
| * merge with 5.1Sergei Golubchik2010-09-112-4/+2
| |\
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-272-4/+2
| | |\
| | | * Fix for bug #50667: The InnoDB plugin prevents initializationRamil Kalimullin2010-07-161-1/+2
| * | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+4
| |\ \ \ | | |/ /
| | * | Remove the file libmysqld.exp from the installerBo Thorsen2010-07-011-2/+0
| | * | Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-1/+2
| | * | Fix cpack runBo Thorsen2010-07-011-1/+1
| | * | Install the files for the embedded serverBo Thorsen2010-06-281-0/+5
* | | | Subquery cache (MWL#66) added.unknown2010-07-101-1/+2
* | | | 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-265-47/+69
|\ \ \ \ | |/ / /
| * | | crash on --with-embedded-privilege-control builds:Sergei Golubchik2010-05-141-0/+2
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-082-2/+3
| * | | more fixes for windows and status_user.testSergei Golubchik2010-04-021-1/+1
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-294-43/+62
| |/ /
* | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-204-2/+18
|\ \ \ | |/ /
| * | Fix windows build of embedded server (forgotten dependency).unknown2010-01-311-1/+1
| * | Merge with MySQL 5.1.42Michael Widenius2010-01-151-1/+0
| |\ \ | | |/
| | * Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-1/+0
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-165-1/+18
| |\ \ | | |/
| | * Automerge.Davi Arnaut2009-11-021-0/+1
| | |\
| | | * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+1
| | * | Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+11
| | * | auto-mergeIngo Struewing2009-10-021-0/+3
| | |\ \
| | | * \ mergingAlexey Botchkov2009-09-295-69/+41
| | | |\ \
| | | * | | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-041-0/+3
| | * | | | auto-mergeIngo Struewing2009-10-012-0/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-292-0/+2
| | * | | | mergeGeorgi Kodinov2009-09-251-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA)Georgi Kodinov2009-09-111-0/+1
* | | | | Subquery optimization backport:Sergey Petrunya2010-02-161-0/+1
* | | | | Merge MWL#67: MRR Backport and BKA backport.Sergey Petrunya2009-12-222-1/+3
|\ \ \ \ \
| * | | | | Backport into MariaDB-5.2 the following:Igor Babaev2009-12-202-1/+3
* | | | | | MWL#67: MRR backportSergey Petrunya2009-12-221-2/+3
|/ / / / /
* | | | | Add ds_mrr.cc to CMakeLists.txtSergey Petrunya2009-12-161-0/+1
* | | | | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-1/+1
|/ / / /
* | | | Added federatedx storage engineMichael Widenius2009-10-301-1/+1
* | | | Fix a problem in windows build introduced a few csets ago (inSergey Petrunya2009-10-051-0/+1
* | | | Fix embedded build on Windows: contents of storage/xtradb think they areSergey Petrunya2009-10-031-2/+2
* | | | Fix embedded server windows build: add opt_table_elimination.cc to list of filesSergey Petrunya2009-10-011-0/+1
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+1
|\ \ \ \
| * \ \ \ Merge maria-5.1 -> maria-5.1-table-eliminationSergey Petrunya2009-08-141-1/+1
| |\ \ \ \
| | * | | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+1
* | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-084-79/+40
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-53/+6
| |\ \ \ \
| | * | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-53/+6
| | | |_|/ | | |/| |
| * | | | 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