Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added comment about QUICK_RANGE_SELECT::free_cond being unused. | Sergey Petrunya | 2012-06-22 | 1 | -1/+1 |
* | 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 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ | |||||
* | | | | | BUG#882994: Crash in QUICK_RANGE_SELECT::reset with derived_with_keys | Sergey Petrunya | 2011-10-31 | 1 | -0/+7 |
* | | | | | 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 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#56862 Execution of a query that uses index merge returns a wrong result | Sergey Glukhov | 2010-11-23 | 1 | -0/+3 |
| | | * | | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -1/+5 |
* | | | | | 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 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | 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 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#41660: Sort-index_merge for non-first join table may | Martin Hansson | 2010-06-24 | 1 | -1/+2 |
| | | * | | Bug#50939: Loose Index Scan unduly relies on engine to | Martin Hansson | 2010-05-10 | 1 | -2/+81 |
* | | | | | 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 |
| | * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -0/+4 |
* | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -1/+1 |
* | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -50/+92 |
|/ / / / | |||||
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | More comments | Sergey Petrunya | 2009-09-02 | 1 | -0/+6 |
* | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -2/+2 |
|/ / | |||||
* | | Merge BUG#36639 into 5.1 | Sergey Petrunia | 2008-08-25 | 1 | -8/+1 |
|\ \ | |/ | |||||
| * | BUG#36639: subselect.test crashes on 64 bit pentium4 when compiled for valgri... | Sergey Petrunia | 2008-08-25 | 1 | -8/+1 |
| * | Bug#37830 : ORDER BY ASC/DESC - no difference | Georgi Kodinov | 2008-07-23 | 1 | -3/+1 |