summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* fixes for test failuresSergei Golubchik2012-09-271-96/+57
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-1/+1
* Fixed compiler warningsMichael Widenius2012-07-061-1/+1
* automatic merge with 5.5Michael Widenius2012-06-271-64/+131
|\
| * Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-0/+2
| |\
| | * Merge 5.2->5.3Sergey Petrunya2012-06-181-0/+2
| | |\
| | | * Fix bug lp:1001506unknown2012-05-231-0/+2
| * | | Merged the fix for bug lp:944706, mdev-193unknown2012-06-191-60/+126
| |\ \ \
| | * \ \ Merge the fix for lp:944706, mdev-193unknown2012-06-061-60/+126
| | |\ \ \
| | | * | | Fixed bug MDEV-288unknown2012-06-011-0/+16
| | | * | | Fixed bug mdev-277 as part of the fix for lp:944706unknown2012-05-181-9/+10
| | | * | | Fix for bug lp:944706, task MDEV-193unknown2012-05-171-60/+109
| * | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-4/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-2/+7
| | |\ \ \ \
| | * \ \ \ \ Merge from 5.1 to 5.5Chaithra Gopalareddy2012-04-181-2/+0
| | |\ \ \ \ \
| | | * | | | | Bug#12713907:STRANGE OPTIMIZE & WRONG RESULT UNDERChaithra Gopalareddy2012-04-181-2/+0
* | | | | | | | Merge with 5.5Michael Widenius2012-06-081-3/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge with 5.3.Sergei Golubchik2012-06-041-3/+32
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | BUG#1002630: Valgrind warnings 'Invalid read' in subselect_engine::calc_const...Sergey Petrunya2012-05-251-3/+16
| | * | | | | | BUG#1000051: Query with simple join and ORDER BY takes thousands times longer...Sergey Petrunya2012-05-231-0/+17
* | | | | | | | Fixed build failures found by buildbotMichael Widenius2012-06-051-1/+2
|/ / / / / / /
* | | | | | | 5.3 mergeSergei Golubchik2012-05-211-11/+59
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.2 mergeSergei Golubchik2012-05-201-12/+18
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 5.1 mergeSergei Golubchik2012-05-181-3/+8
| | |\ \ \ \ \
| | | * \ \ \ \ merge with mysql-5.1.63Sergei Golubchik2012-05-171-3/+8
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge 5.2->5.3Sergey Petrunya2012-05-121-3/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | BUG#997747: Assertion `join->best_read < ((double)1.79..5e+308L)' failed Sergey Petrunya2012-05-121-3/+5
| * | | | | | | | BUG#1000269: Wrong result (extra rows) with semijoin+materialization, IN subq...Sergey Petrunya2012-05-181-6/+11
| * | | | | | | | Merge 5.2->5.3unknown2012-05-111-2/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix for bug lp:992405unknown2012-05-071-2/+25
| * | | | | | | | Addition to the fix to LP bug#994275.unknown2012-05-081-2/+13
| * | | | | | | | LP bug#994275 fix.unknown2012-05-071-0/+10
* | | | | | | | | cSergei Golubchik2012-05-211-10/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 5.1-security -> 5.5-security mergeSergey Glukhov2012-04-041-1/+6
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Bug#11766300 59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_P...Sergey Glukhov2012-04-041-1/+6
| | * | | | | | Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET)Tor Didriksen2012-02-221-2/+2
| | | |_|_|/ / | | |/| | | |
* | | | | | | Fixed LP bug #999251: Q13 from DBT3 uses table scan instead of covering index...Igor Babaev2012-05-161-2/+4
| |_|_|_|_|/ |/| | | | |
* | | | | | 5.3 mergeSergei Golubchik2012-05-041-6/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 5.2 mergeSergei Golubchik2012-05-021-6/+11
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | MDEV-214 lp:967242 Wrong result with JOIN, AND in ON condition, multi-part ke...Oleksandr Byelkin2012-05-021-6/+11
* | | | | | mergeVladislav Vaintroub2012-04-171-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed LP bug #972943 properly.Igor Babaev2012-04-071-1/+0
* | | | | | mergeSergei Golubchik2012-04-071-14/+207
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed LP bug #972973.Igor Babaev2012-04-071-0/+1
| * | | | | mergeSergei Golubchik2012-04-051-11/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | mergeSergei Golubchik2012-04-051-11/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-051-11/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
| * | | | | MergeSergey Petrunya2012-04-041-0/+193
| |\ \ \ \ \
| | * | | | | BUG#913030: better comments and function names.Sergey Petrunya2012-04-041-4/+44
| | * | | | | BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3Sergey Petrunya2012-04-021-0/+153