summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+25
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULTSergey Glukhov2011-10-121-0/+25
* | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge with 5.2.Michael Widenius2011-12-111-4/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-4/+5
| | | |\ \
| | | | * \ Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-3/+3
| | | | |\ \
| | | | | * \ weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-05-101-5/+1
| | | | | |\ \
| | | | * | \ \ Updated/added copyright headersKent Boortz2011-07-031-6/+2
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix of LP BUG#872775.unknown2011-11-011-1/+3
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-5/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge from mysql-5.5.14-releaseunknown2011-07-061-3/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-101-5/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge 5.1 => 5.5 : Bug#12329653Tor Didriksen2011-05-051-3/+3
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | merge 5.0 => 5.1 : Bug#12329653Tor Didriksen2011-05-041-3/+3
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BYTor Didriksen2011-05-041-3/+3
| * | | | | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Post-merge fixes: Fix problems in table_elim.test and enable it.Sergey Petrunya2011-10-271-5/+14