summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* post-merge fixes.Sergei Golubchik2011-07-021-1/+1
* 5.5-mergeSergei Golubchik2011-07-026-313/+53
|\
| * BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.Mayank Prasad2011-06-141-2/+2
| * merge from 5.1 for bug#11764633Mayank Prasad2011-05-181-2/+26
| * MergeKent Boortz2010-12-292-14/+15
| |\
| | * MergeKent Boortz2010-12-292-14/+15
| | |\
| | | * - Added/updated copyright headersKent Boortz2010-12-282-14/+15
| | | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-1/+1
| * | | Merge 5.5-bug58158 into 5.5-bugteamMagnus Blåudd2010-11-241-2/+1
| |\ \ \
| | * | | Bug#58158 LINK_LIBRARIES for MYSQL_ADD_PLUGIN is not added to libmysqldMagnus Blåudd2010-11-161-2/+1
| * | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-282/+0
| * | | | BUG#57108: mysqld crashes when I attempt to install pluginMats Kindahl2010-11-041-1/+2
| |/ / /
| * | | mergeGeorgi Kodinov2010-10-042-14/+14
| |\ \ \
| * \ \ \ merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-202-4/+7
| |\ \ \ \
| * \ \ \ \ merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-162-4/+4
| |\ \ \ \ \
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-095-37/+56
* | | | | | | lots of post-merge changesSergei Golubchik2011-04-253-25/+2
* | | | | | | merge.Sergei Golubchik2010-11-256-44/+99
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix windows embeddedSergei Golubchik2010-11-021-1/+2
| * | | | | | 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
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | * | | | | | | 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-165-1/+18
| | |\ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \