Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | merged mysql-5.5 into WL1054-5.5 | Georgi Kodinov | 2010-08-16 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 5 | -37/+56 | |
* | | | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 3 | -25/+2 | |
* | | | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 6 | -44/+99 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | fix windows embedded | Sergei Golubchik | 2010-11-02 | 1 | -1/+2 | |
| * | | | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 3 | -4/+6 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | * | | | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -4/+2 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | * | | | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -4/+2 | |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | ||||||
| | * | | | | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Remove the file libmysqld.exp from the installer | Bo Thorsen | 2010-07-01 | 1 | -2/+0 | |
| | | * | | | | | | Hardcode the build path for the installer temporarily | Bo Thorsen | 2010-07-01 | 1 | -1/+2 | |
| | | * | | | | | | Fix cpack run | Bo Thorsen | 2010-07-01 | 1 | -1/+1 | |
| | | * | | | | | | Install the files for the embedded server | Bo Thorsen | 2010-06-28 | 1 | -0/+5 | |
| * | | | | | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -1/+2 | |
| * | | | | | | | | Add sql/opt_index_cond_pushdown.cc to CMakeLists.txt files | Sergey Petrunya | 2010-06-27 | 1 | -0/+1 | |
| * | | | | | | | | Fix windows build: add sql/opt_subselect.cc to CMakeLists.txt files | Sergey Petrunya | 2010-06-27 | 1 | -0/+1 | |
| * | | | | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 5 | -47/+69 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | crash on --with-embedded-privilege-control builds: | Sergei Golubchik | 2010-05-14 | 1 | -0/+2 | |
| | * | | | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 2 | -2/+3 | |
| | * | | | | | | | more fixes for windows and status_user.test | Sergei Golubchik | 2010-04-02 | 1 | -1/+1 | |
| | * | | | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 4 | -43/+62 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 4 | -2/+18 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Fix windows build of embedded server (forgotten dependency). | unknown | 2010-01-31 | 1 | -1/+1 | |
| | * | | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 5 | -1/+18 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Subquery optimization backport: | Sergey Petrunya | 2010-02-16 | 1 | -0/+1 | |
| * | | | | | | | | | Merge MWL#67: MRR Backport and BKA backport. | Sergey Petrunya | 2009-12-22 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Backport into MariaDB-5.2 the following: | Igor Babaev | 2009-12-20 | 2 | -1/+3 | |
| * | | | | | | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -2/+3 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Add ds_mrr.cc to CMakeLists.txt | Sergey Petrunya | 2009-12-16 | 1 | -0/+1 | |
| * | | | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -1/+1 | |
| * | | | | | | | | Fix a problem in windows build introduced a few csets ago (in | Sergey Petrunya | 2009-10-05 | 1 | -0/+1 | |
| * | | | | | | | | Fix embedded build on Windows: contents of storage/xtradb think they are | Sergey Petrunya | 2009-10-03 | 1 | -2/+2 | |
| * | | | | | | | | Fix embedded server windows build: add opt_table_elimination.cc to list of files | Sergey Petrunya | 2009-10-01 | 1 | -0/+1 | |
| * | | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge maria-5.1 -> maria-5.1-table-elimination | Sergey Petrunya | 2009-08-14 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 4 | -79/+40 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge XtraDB 6 with latest MariaDB 5.1 | unknown | 2009-08-03 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/... | unknown | 2009-06-09 | 1 | -2/+2 | |
| * | | | | | | | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -0/+25 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ |