summaryrefslogtreecommitdiff
path: root/sql/item.h
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minusSergey Petrunya2009-09-081-22/+177
|\
| * Bug #44399 : crash with statement using TEXT columns, aggregates, GROUP BY, andGeorgi Kodinov2009-05-251-22/+177
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+1
|\ \ | |/
| * auto-mergeIgnacio Galarza2009-03-171-0/+2
| |\
| * \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
| |\ \
* | \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-02-191-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Bug#37601 Cast Is Not Done On Row ComparisonSergey Glukhov2009-02-191-0/+2
| | |/
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-1/+4
|\ \ \ | |/ /
| * | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-01-161-0/+3
| |\ \ | | |/
| | * Bug #38637: COUNT DISTINCT prevents NULL testing in HAVING clauseGeorgi Kodinov2008-10-171-0/+3
| * | Merge from mysql-5.1.30-releaseunknown2008-11-271-1/+1
| |\ \
| | * | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
* | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+6
|\ \ \ \ | |/ / /
| * | | merge 5.1-bugteam -> bug 32124 5.1 treeGeorgi Kodinov2008-10-081-1/+1
| |\ \ \ | | |/ /
| | * | Bug #37348: Crash in or immediately after JOIN::make_sum_func_listGeorgi Kodinov2008-10-021-1/+1
| * | | Bug #32124: crash if prepared statements refer to variables in the where clauseGeorgi Kodinov2008-10-081-0/+5
| |/ /
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+4
|\ \ \ | |/ /
| * | Merge from 5.0-bugteam.Chad MILLER2008-08-151-1/+1
| |\ \ | | |/
| | * Bug#37301 Length and Max_length differ with no obvious reason(2nd version)Chad MILLER2008-08-151-1/+1
| * | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-08-111-2/+2
| |\ \ | | |/
| | * Bug#38296 (low memory crash with many conditions in a query)Marc Alff2008-08-111-2/+2
| | * Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-121-8/+31
| | |\
| | | * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-101-8/+1
| | | |\
| * | | | Tentative implementation ofunknown2008-04-081-0/+1
* | | | | Manual merge and some fixes.unknown2008-05-141-0/+1
* | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-71/+155
|\ \ \ \ \ | |/ / / /
| * | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-8/+31
| |\ \ \ \
| | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-03-101-8/+1
| | |\ \ \ \
| | | * \ \ \ Merge mysql.com:/misc/mysql/34749/50-34749unknown2008-03-101-8/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Bug#34749: Server crash when using NAME_CONST() with an aggregate functionunknown2008-02-281-8/+1
| | * | | | | Merge host.loc:/home/uchum/work/PP/5.0-opt-34620unknown2008-02-281-0/+29
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixed bug #34620: item_row.cc:50: Item_row::illegal_method_call(const char*):unknown2008-02-281-0/+29
| | * | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-02-131-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Fixed bug #33833.unknown2008-01-261-0/+1
| | | |/ /
| * | | | Merge buzz.(none):/home/davi/mysql-5.0-runtimeunknown2008-02-281-7/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210unknown2008-02-281-7/+2
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2008-02-221-36/+54
| |\ \ \ \
| | * | | | Fix for Bug#30217: Views: changes in metadata behaviourunknown2008-02-221-36/+54
| * | | | | Post-merge fixes for bug 32890unknown2008-02-211-2/+0
| * | | | | Merge buzz.(none):/home/davi/mysql-5.0-runtimeunknown2008-02-211-20/+25
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Bug#32890 Crash after repeated create and drop of tables and viewsunknown2008-02-211-20/+23
| | | |/ | | |/|
| | * | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-12-131-1/+21
| | |\ \
| | | * \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-11-211-1/+21
| | | |\ \
| * | | | | Fix for Bug#32538: View definition picks up character set,unknown2008-02-121-0/+45
| | |_|_|/ | |/| | |
* | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | First part of redo/undo for key pagesunknown2007-11-141-6/+6
* | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-2/+19
|\ \ \ \ \
| * \ \ \ \ Merge magare.gmz:/home/kgeorge/mysql/work/B30788-5.0-optunknown2007-11-211-1/+21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug #30788: Inconsistent retrieval of char/varcharunknown2007-11-211-1/+21