summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-2/+2
|\
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
* | Fixed errors and compiler warnings found by buildbotMichael Widenius2013-05-051-2/+2
* | 5.5 mergeSergei Golubchik2013-03-271-1/+1
|\ \ | |/ |/|
| * 5.3->5.5 mergeSergei Golubchik2013-03-101-1/+1
| |\
| | * Fix typo (clang issued warning that =+ was used where += was intended)Vladislav Vaintroub2013-03-061-1/+1
* | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-3/+3
* | | pre-mergeunknown2012-12-231-493/+495
|\ \ \
| * | | backport to 5.5 dyncol changes and names supportunknown2012-12-231-2/+2
| * | | Cassandra storage engine: BKA supportSergey Petrunya2012-08-271-1/+4
* | | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-1/+2
|\ \ \ \
| * | | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-1/+2
| * | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge 5.5 -> mwl248Igor Babaev2012-09-081-3/+4
| | |\ \ \
| | * \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-7/+11
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-1/+1
* | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-4/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.3 mergeSergei Golubchik2012-10-181-4/+25
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Fixed LP bug #1058071 (mdev-564).Igor Babaev2012-09-291-4/+25
* | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | MWL#182: Explain running statementsSergey Petrunya2012-04-261-3/+3
* | | | | 5.3 mergeSergei Golubchik2012-08-311-3/+4
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Fix bugs in BatchedKeyAccess that show up when working with a Sergey Petrunya2012-08-281-3/+4
| |/ /
* | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-7/+11
|\ \ \ | |/ / | | / | |/ |/|
| * Speedup:Michael Widenius2012-03-231-7/+11
* | 5.3 mergeSergei Golubchik2012-02-241-6/+6
|\ \ | |/
| * Changed names of statistic variables and counting matches instaed of rejected...unknown2012-02-221-6/+6
* | 5.3 mergeSergei Golubchik2012-02-211-2/+20
|\ \ | |/
| * Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-161-2/+20
* | 5.3.4 mergeSergei Golubchik2012-02-151-10/+12
|\ \ | |/
| * Fixed LP bug #925985.Igor Babaev2012-02-131-0/+2
| * Fixed LP bug #922971.Igor Babaev2012-01-281-10/+10
* | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ | |/
| * Subquery code cleanups:Sergey Petrunya2011-11-251-1/+1
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-18/+58
|\ \ | |/
| * Fixed LP bug #881318.Igor Babaev2011-10-251-1/+18
| * Automerge.Sergey Petrunya2011-09-081-3/+16
| |\
| | * BUG#830993: Crash in end_read_record with derived tableSergey Petrunya2011-09-081-3/+16
| * | Fixed lp:828514 "Assertion `! is_set()' failed in Diagnostics_area::set_ok_st...Michael Widenius2011-09-031-14/+24
| |/
* | merge with 5.3Sergei Golubchik2011-10-191-1144/+2425
|\ \ | |/
| * Fixed LP bug #802860.Igor Babaev2011-06-281-5/+22
| * Merge MWL#90 into 5.3-mainSergey Petrunya2011-04-301-82/+137
| |\
| | * Merge MWL#90 with main 5.3 treeSergey Petrunya2011-04-021-82/+137
| | |\
| | | * Make first_linear_tab()/next_linear_tab() use named constants instead of TRUE...Sergey Petrunya2011-03-251-9/+13
| | | * MWL#90: Address review feedback part #9:Sergey Petrunya2011-03-221-1/+7
| | | * MWL#90: Address review feedback part #8Sergey Petrunya2011-03-221-1/+1
| | | * MWL#90: Address review feedback part #7Sergey Petrunya2011-03-221-13/+33
| | | * MWL#90: Address review feedback part #5Sergey Petrunya2011-03-221-3/+9
| | | * MWL#90: Address review feedback part #2Sergey Petrunya2011-03-211-0/+8