summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-55/+57
* Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-1/+1
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-14/+14
* 10.0-base mergeSergei Golubchik2013-01-311-105/+133
|\
| * 5.5 mergeSergei Golubchik2013-01-291-99/+122
| |\
| | * 5.3 mergeSergei Golubchik2013-01-281-54/+40
| | |\
| | | * MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque...Sergei Golubchik2013-01-261-56/+41
| | * | Merge 5.3->5.5Igor Babaev2013-01-231-0/+10
| | |\ \ | | | |/
| | | * MDEV-3988 fix.unknown2013-01-161-0/+10
| | | * Fixed bug mdev-4025.Igor Babaev2013-01-111-2/+3
| | * | mysql-5.5.29 mergeSergei Golubchik2013-01-151-18/+23
| | |\ \
| | | * \ Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| | | |\ \
| | | * | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-13/+55
| | | * | | Bug#14542543 FIX BUG #12694872 IN 5.5Tor Didriksen2012-09-181-6/+6
| | | * | | merge 5.1 => 5.5Tor Didriksen2012-09-121-4/+11
| | | |\ \ \
| | * | \ \ \ 5.3 mergeSergei Golubchik2013-01-151-14/+17
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | 5.2->5.3 mergeSergei Golubchik2013-01-101-12/+12
| | | |\ \ \ \
| | | | * \ \ \ 5.1 mergeSergei Golubchik2013-01-101-12/+12
| | | | |\ \ \ \
| | | | | * \ \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-091-12/+12
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | | * | | Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| | | | | | | |/ | | | | | | |/|
| | | | | | * | Backport Bug#13724099Tor Didriksen2012-09-121-5/+12
| | | * | | | | Fixed LP bug #1002146 (bug mdev-645).Igor Babaev2012-11-211-3/+6
| | * | | | | | Fix for bug MDEV-3992, second attemptunknown2013-01-151-17/+28
| | * | | | | | Fix for bug MDEV-3992unknown2013-01-141-2/+11
| | * | | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-2/+2
| | * | | | | | non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOBSergei Golubchik2013-01-071-1/+1
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-6/+11
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-22/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-2/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge 5.5 -> mwl248Igor Babaev2013-01-081-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | MDEV-3899 Valgrind warnings (blocks are definitely lost) in filesort on IN s...unknown2012-12-201-2/+2
| * | | | | | | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-20/+29
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-20/+29
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge 5.5 -> mwl248Igor Babaev2012-12-141-0/+13
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | * | | | | | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-9/+9
| | | * | | | | | | Merge 5.5->mwl248Igor Babaev2012-12-041-71/+246
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-21/+30
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge 5.5 -> mwl248Igor Babaev2012-09-081-37/+1
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-29/+38
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-4/+37
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-4/+5
| | | | * | | | | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-67/+163
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Changed the type of all double columns in the system statistical tablesIgor Babaev2012-06-251-3/+3
| | | | * | | | | | | | | | | | MergeIgor Babaev2012-06-011-21/+75
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge.Igor Babaev2012-05-181-9/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fixed the bug that caused displaying incorrect values inIgor Babaev2012-05-171-0/+1
| | | | * | | | | | | | | | | | | | Fixed a problem for Q18 from DBT3/SF30 with innodb database instance:Igor Babaev2012-04-191-0/+1
| | | | * | | | | | | | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-34/+245
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-24/+30
* | | | | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-133/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /