summaryrefslogtreecommitdiff
path: root/sql/opt_range.h
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix for MDEV-3948, and backport of the following collection of fixes and back...unknown2013-01-281-1/+1
| |/ |/|
* | Merge 5.3->5.5.Igor Babaev2012-06-241-1/+1
|\ \ | |/
| * Added comment about QUICK_RANGE_SELECT::free_cond being unused.Sergey Petrunya2012-06-221-1/+1
* | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ | |/
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
* | | | \ 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | BUG#882994: Crash in QUICK_RANGE_SELECT::reset with derived_with_keysSergey Petrunya2011-10-311-0/+7
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
* | | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-51/+115
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge from 5.2unknown2011-07-211-4/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge 5.1->5.2unknown2011-07-211-3/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Removed incorrect fix and its test suite (the test suit is duplicate).unknown2011-07-211-3/+0
| * | | | | | Eliminated the member original_cond from the class SQL_SELECTIgor Babaev2011-05-291-5/+0
| * | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+5
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge with 5.2Michael Widenius2011-03-091-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+3
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | MergeIgor Babaev2010-12-281-2/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ MergeIgor Babaev2010-12-281-2/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ MergeIgor Babaev2010-12-271-35/+92
| | | |\ \ \ \ \ \
| | | * | | | | | | Post-merge fixes.Igor Babaev2010-12-271-4/+1
| | | | |_|/ / / / | | | |/| | | | |
| * | | | | | | | MergeIgor Babaev2010-12-271-38/+93
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge: mwl#24+mwl#21 5.1->5.2Igor Babaev2010-12-241-38/+93
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Addressed the feedback from the review of Monty on the cumulative patch for Igor Babaev2010-12-191-60/+60
| | | * | | | | MergeIgor Babaev2010-12-091-7/+62
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | MWL #21: "index_merge: non-ROR intersection".Igor Babaev2010-12-011-1/+7
| | | | * | | | An implementation of index intersect via a modified Unique class.Igor Babaev2010-09-131-6/+55
| * | | | | | | MWL#121-125 DS-MRR improvementsSergey Petrunya2010-12-131-2/+2
| * | | | | | | Merge DS-MRR/CPK improvements into 5.3-mainSergey Petrunya2010-12-131-0/+7
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-011-0/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#625841: Assertion `!table || (!table->read_set || bitmap_is_setSergey Petrunya2010-09-151-0/+7
| * | | | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-2/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | merge with 5.1Michael Widenius2010-11-301-2/+10
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Patch from Sergey Petrunya:Michael Widenius2010-11-261-2/+10
| | | | |/ / / / | | | |/| | | |
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-0/+58
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select() Jorgen Loland2010-12-171-0/+55
| * | | | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-11-231-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Bug#56862 Execution of a query that uses index merge returns a wrong resultSergey Glukhov2010-11-231-0/+3
* | | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-2/+1
* | | | | | | | merge.Sergei Golubchik2010-11-251-55/+115
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-3/+83
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-3/+83
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+83
| | | |\ \ \
| * | | \ \ \ MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-1/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+17
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Changed the fixes for the following bugs:Igor Babaev2010-05-251-1/+13