Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+3 |
|\ | |||||
| * | Set new default values for the optimizer switch flags 'derived_merge' | Igor Babaev | 2011-11-26 | 1 | -0/+3 |
* | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -3/+3 |
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+114 |
|\ \ | |||||
| * | | Fix for bug #12828477 - "MDL SUBSYSTEM CREATES BIG OVERHEAD | Dmitry Lenev | 2011-08-11 | 1 | -0/+114 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Made the optimizer switches 'derived_merge' and 'derived_with_keys' | Igor Babaev | 2011-07-21 | 1 | -1/+2 |
| * | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -2/+1 |
| |\ \ | |||||
| | * \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -2/+1 |
| | |\ \ | |||||
| | | * \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -2/+1 |
| | | |\ \ | |||||
| | | | * | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -2/+1 |
| * | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -4/+4 |
| * | | | | | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -2/+2 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 1 | -3/+3 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+46 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Bug #57916: Fix the naming of the proxy_priv table | Georgi Kodinov | 2010-11-02 | 1 | -1/+1 |
| * | | | | | A fix and a test case for Bug#56540 "Exception (crash) in | Konstantin Osipov | 2010-10-14 | 1 | -0/+44 |
| * | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -1/+3 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -10/+4 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -74/+45 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+18 |
| |\ \ \ \ | |||||
| | * | | | | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 1 | -1/+1 |
| | * | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -0/+17 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+10 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+10 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | merge | Sergei Golubchik | 2010-06-14 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | | | |||||
| | * | | | | fixed for mysql-test-run to | Sergei Golubchik | 2010-06-10 | 1 | -3/+3 |
| | * | | | | Merge XtraDB 10 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+2 |
| * | | | | | after merge fix. | Sergei Golubchik | 2010-06-07 | 1 | -0/+2 |
| * | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
| * | | | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -1/+23 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+23 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Automerge MySQL 5.1.44 merge into latest MariaDB trunk. | unknown | 2010-03-10 | 1 | -0/+22 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+22 |
| | | | |\ \ \ | |||||
| | | * | | | | | Fixes for two test failures in Buildbot. | unknown | 2010-03-10 | 1 | -1/+1 |
| | | |/ / / / | |||||
| * | | | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -0/+1 |
| |/ / / / / | |||||
| * | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge XtraDB 9 into MariaDB. | unknown | 2010-01-15 | 1 | -1/+2 |
| * | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -1/+13 |
| |/ / / / | |||||
| * | | | | Fix race in test of times shown in SHOW FULL PROCESSLIST. | unknown | 2009-09-29 | 1 | -1/+1 |
| * | | | | Merge Percona microsec_process patch into MariaDB. | unknown | 2009-09-23 | 1 | -2/+12 |
| * | | | | Merge XtraDB 6 into MariaDB. | unknown | 2009-08-03 | 1 | -0/+4 |
| * | | | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -8/+23 |
| |\ \ \ \ | |||||
| | * | | | | XtraDB after-merge fixes. | unknown | 2009-06-09 | 1 | -8/+23 |
| * | | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -12/+12 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -140/+2 |