Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Fix for MDEV-3948, and backport of the following collection of fixes and back... | unknown | 2013-01-28 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Merge 5.3->5.5. | Igor Babaev | 2012-06-24 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Added comment about QUICK_RANGE_SELECT::free_cond being unused. | Sergey Petrunya | 2012-06-22 | 1 | -1/+1 | |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 | |
|\ \ | |/ | ||||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 | |
| |\ | ||||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 | |
| | |\ | ||||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
| | | |\ | ||||||
* | | | \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+7 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | BUG#882994: Crash in QUICK_RANGE_SELECT::reset with derived_with_keys | Sergey Petrunya | 2011-10-31 | 1 | -0/+7 | |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| | |\ \ \ \ | ||||||
* | | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -51/+115 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge from 5.2 | unknown | 2011-07-21 | 1 | -4/+0 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | Merge 5.1->5.2 | unknown | 2011-07-21 | 1 | -3/+0 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | | * | | | | Removed incorrect fix and its test suite (the test suit is duplicate). | unknown | 2011-07-21 | 1 | -3/+0 | |
| * | | | | | | Eliminated the member original_cond from the class SQL_SELECT | Igor Babaev | 2011-05-29 | 1 | -5/+0 | |
| * | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+5 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+3 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+3 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+3 | |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | ||||||
| * | | | | | | Merge | Igor Babaev | 2010-12-28 | 1 | -2/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge | Igor Babaev | 2010-12-28 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge | Igor Babaev | 2010-12-27 | 1 | -35/+92 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | Post-merge fixes. | Igor Babaev | 2010-12-27 | 1 | -4/+1 | |
| | | | |_|/ / / / | | | |/| | | | | | ||||||
| * | | | | | | | | Merge | Igor Babaev | 2010-12-27 | 1 | -38/+93 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge: mwl#24+mwl#21 5.1->5.2 | Igor Babaev | 2010-12-24 | 1 | -38/+93 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | Addressed the feedback from the review of Monty on the cumulative patch for | Igor Babaev | 2010-12-19 | 1 | -60/+60 | |
| | | * | | | | | Merge | Igor Babaev | 2010-12-09 | 1 | -7/+62 | |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | | * | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -1/+7 | |
| | | | * | | | | An implementation of index intersect via a modified Unique class. | Igor Babaev | 2010-09-13 | 1 | -6/+55 | |
| * | | | | | | | MWL#121-125 DS-MRR improvements | Sergey Petrunya | 2010-12-13 | 1 | -2/+2 | |
| * | | | | | | | Merge DS-MRR/CPK improvements into 5.3-main | Sergey Petrunya | 2010-12-13 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | BUG#625841: Assertion `!table || (!table->read_set || bitmap_is_set | Sergey Petrunya | 2010-09-15 | 1 | -0/+7 | |
| * | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+10 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | * | | | | | | Patch from Sergey Petrunya: | Michael Widenius | 2010-11-26 | 1 | -2/+10 | |
| | | | |/ / / / | | | |/| | | | | ||||||
* | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+58 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select() | Jorgen Loland | 2010-12-17 | 1 | -0/+55 | |
| * | | | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-11-23 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | Bug#56862 Execution of a query that uses index merge returns a wrong result | Sergey Glukhov | 2010-11-23 | 1 | -0/+3 | |
* | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+1 | |
* | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -55/+115 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -3/+83 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+83 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+83 | |
| | | |\ \ \ | ||||||
| * | | \ \ \ | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -1/+17 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+17 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -1/+13 |