summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-9/+9
|\
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+1
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-7/+7
* | 10.0-base mergeSergei Golubchik2013-07-181-43/+61
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-43/+61
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-161-43/+61
| | |\ \
| | | * \ Merge from 5.1 to 5.5Chaithra Gopalareddy2013-04-141-3/+4
| | | |\ \
| | | | * | Bug#16347426:ASSERTION FAILED: (SELECT_INSERT &&Chaithra Gopalareddy2013-04-141-3/+4
| | | * | | Merge from 5.1 to 5.5Chaithra Gopalareddy2013-03-311-38/+50
| | | |\ \ \ | | | | |/ /
| | | | * | Bug #16347343 : CRASH, GROUP_CONCAT, DERIVED TABLESChaithra Gopalareddy2013-03-311-38/+50
| | | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | | * | | 5.1 -> 5.5 mergeSergey Glukhov2013-03-141-1/+8
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#16075310 SERVER CRASH OR VALGRIND ERRORS IN ITEM_FUNC_GROUP_CONCAT::SETUP...Sergey Glukhov2013-03-141-1/+8
* | | | | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-101-3/+3
|/ / / / /
* | | | | 5.5 mergeSergei Golubchik2013-06-061-5/+16
|\ \ \ \ \ | |/ / / /
| * | | | 5.3 merge.Sergei Golubchik2013-05-201-5/+16
| |\ \ \ \
| | * | | | MDEV-4290:unknown2013-05-031-5/+16
| * | | | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOMNisha Gopalakrishnan2013-01-151-0/+4
* | | | | | Merge 5.5->10.0-baseIgor Babaev2013-03-311-2/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MergeIgor Babaev2013-03-271-1/+30
| |\ \ \ \ \
| | * | | | | Fixed bug mdev-4311 (bug #68749).Igor Babaev2013-03-271-1/+30
* | | | | | | 5.5 mergeSergei Golubchik2013-03-271-8/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.3 mergeSergei Golubchik2013-03-271-2/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | MDEV-4286 Server crashes in Protocol_text::store, stack smashing detectedSergei Golubchik2013-03-171-2/+3
| * | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-6/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#15972635: Incorrect results returned in 32 table join with HAVINGRoy Lyseng2012-12-211-6/+9
* | | | | | [NOT] EXISTS to IN transformation.unknown2013-02-261-1/+6
| |_|_|_|/ |/| | | |
* | | | | 5.5 mergeSergei Golubchik2013-01-291-25/+31
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.3->5.5Igor Babaev2013-01-231-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge 5.2->5.3Igor Babaev2013-01-211-2/+2
| | |\ \ \
| | | * \ \ Merge 5.1->5.2Igor Babaev2013-01-211-2/+2
| | | |\ \ \
| | | | * | | Fixed bug mdev-4063 (bug #56927).Igor Babaev2013-01-211-2/+2
| * | | | | | Fixed crashing bug in GROUP_CONCAT with ROLLUPMichael Widenius2013-01-111-9/+20
| * | | | | | MDEV-3987 uninitialized read in Item_cond::fix_fields leads to crash: select ...Sergei Golubchik2013-01-081-15/+10
* | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+2
* | | | | | | Merge 5.5->mwl248Igor Babaev2012-12-041-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ...Sergei Golubchik2012-11-171-3/+3
* | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 5.2->5.3Sergey Petrunya2012-06-181-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collectionunknown2012-05-221-0/+3
* | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-3/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-2/+1
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-4/+4
* | | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-2/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-2/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Fixed LP bug #777654.Igor Babaev2011-12-281-2/+1
* | | | | | MDEV-135: work-around a GCC bug seen on Debian 5 "lenny" 64-bit.unknown2012-02-061-1/+1