summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
Commit message (Expand)AuthorAgeFilesLines
* cleanup: comments referring to non-extistent Item classesSergei Golubchik2014-12-041-3/+3
* 5.5 mergeSergei Golubchik2014-02-251-19/+24
|\
| * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-19/+24
| |\
| | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | * Bug#16539979 - BASIC SELECT COUNT(DISTINCT ID) IS BROKENGuilhem Bichot2013-12-041-19/+24
* | | 5.5 mergeSergei Golubchik2013-07-171-2/+2
|\ \ \ | |/ /
| * | mysql-5.5.32 mergeSergei Golubchik2013-07-161-3/+3
| |\ \ | | |/
| | * Merge from 5.1 to 5.5Chaithra Gopalareddy2013-04-141-2/+3
| | |\
| | | * Bug#16347426:ASSERTION FAILED: (SELECT_INSERT &&Chaithra Gopalareddy2013-04-141-2/+3
* | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-3/+3
|/ / /
* | | Fixed bug mdev-4311 (bug #68749).Igor Babaev2013-03-271-0/+1
* | | non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOBSergei Golubchik2013-01-071-1/+1
* | | Merge 5.3->5.5.Igor Babaev2012-03-011-1/+0
|\ \ \
| * | | Rolled back the patch for bug 791761.Igor Babaev2012-02-261-1/+0
* | | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULTSergey Glukhov2011-10-121-0/+1
* | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\ \ \
| | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\ \ \
| | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | * | | | backported the fix for bug #34773 to 5.0Georgi Kodinov2008-12-091-7/+18
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-8/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fixed LP bug #791761.Igor Babaev2011-07-201-0/+1
| * | | | | | Fixed LP BUG#800696.unknown2011-07-191-0/+1
| | |_|_|/ / | |/| | | |
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-6/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-6/+6
| | |\ \ \ \
| * | | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-2/+7
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-18/+41
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Backport of fix for Bug#52123Tor Didriksen2011-02-021-7/+5
| * | | | | | Merging from mysql-5.1Alexander Barkov2011-01-171-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#59149 valgrind warnings with "like .. escape .." functionAlexander Barkov2011-01-171-0/+1
| | | |_|/ / | | |/| | |
| * | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-211-5/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#58030 crash in Item_func_geometry_from_text::val_strSergey Glukhov2010-12-211-5/+5
| * | | | | Bug #57954: BIT_AND function returns incorrect results Georgi Kodinov2010-12-081-6/+14
| * | | | | Fix for Bug#57932 "query with avg returns incorrect results":Guilhem Bichot2010-12-071-0/+16
* | | | | | merge.Sergei Golubchik2010-11-251-0/+29
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | merge with 5.1Sergei Golubchik2010-10-251-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 5.1.51 mergeSergei Golubchik2010-10-191-1/+0
| | |\ \ \ | | | |/ /
| * | | | Automerge with 5.1Michael Widenius2010-08-251-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly...Michael Widenius2010-08-231-1/+3
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-1/+1
| | |\ \ \
| * | \ \ \ merge 5.1->5.2Sergei Golubchik2010-06-011-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-3/+3
| | |\ \ \ \