summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * \ \ \ 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 XtraDB 6 with latest MariaDB 5.1unknown2009-08-031-2/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge of Percona XtraDB into MariaDB.unknown2009-06-111-2/+2
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-091-2/+2
| * | | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-0/+25
| |/ / / / / /
| * | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-0/+9
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+9
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-2/+2
| | |\ \ \ \ \ \ \
| * | | | | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-0/+1
| * | | | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-152-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / /
| * | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-0/+7
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-104-12/+24
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-284-6/+21
| | |\ \ \ \ \ \ \ \ \
View Lorry Controller Status