summaryrefslogtreecommitdiff
path: root/sql/item.cc
Commit message (Expand)AuthorAgeFilesLines
* Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+18
|\
| * 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-03-191-1/+18
| |\
| | * Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASESergey Glukhov2009-03-191-1/+18
* | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-40/+43
|\ \ \ | |/ /
| * | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-02-201-1/+0
| |\ \ | | |/
| | * fixed a warningGeorgi Kodinov2009-02-201-1/+0
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-02-191-39/+43
| |\ \ | | |/
| | * Bug#37601 Cast Is Not Done On Row ComparisonSergey Glukhov2009-02-191-33/+43
| * | Automerge.Alexey Kopytov2009-02-191-1/+1
| |\ \ | | |/
| | * Fix for bug #41078: With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch() ...Alexey Kopytov2009-02-191-1/+1
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-6/+19
|\ \ \ | |/ /
| * | Auto-mergeRamil Kalimullin2009-02-051-6/+19
| |\ \ | | |/
| | * Fix for bug#42014: Crash, name_const with collateRamil Kalimullin2009-02-051-6/+19
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-7/+27
|\ \ \ | |/ /
| * | auto-mergeTatiana A. Nurnberg2009-01-311-2/+2
| |\ \ | | |/
| | * auto-mergeTatiana A. Nurnberg2009-01-311-2/+2
| | |\
| | | * Bug#41370: TIMESTAMP field does not accepts NULL from FROM_UNIXTIME()Tatiana A. Nurnberg2009-01-301-2/+2
| * | | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-01-161-1/+18
| |\ \ \ | | |/ /
| | * | auto mergeGeorgi Kodinov2009-01-161-1/+18
| | |\ \ | | | |/ | | |/|
| | | * Bug #38637: COUNT DISTINCT prevents NULL testing in HAVING clauseGeorgi Kodinov2008-10-171-1/+18
| | * | backported the fix for bug #34773 to 5.0Georgi Kodinov2008-12-091-2/+2
| * | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-051-1/+1
| |\ \ \
| | * \ \ 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
| * | | | | Fix warnings and bug spotted by gcc-4.3.Davi Arnaut2008-12-161-3/+3
| * | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-091-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Bug#35796 SHOW CREATE TABLE and default value for BIT fieldSergey Glukhov2008-12-091-0/+3
| | | |/ | | |/|
* | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-27/+50
|\ \ \ \ | |/ / /
| * | | Merge mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2008-10-151-1/+2
| |\ \ \ | | |/ /
| | * | Bug#38823: Invalid memory access when a SP statement does wildcard expansionDavi Arnaut2008-10-141-1/+2
| * | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2008-10-131-4/+6
| |\ \ \ | | | |/ | | |/|
| | * | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcGleb Shchepa2008-10-081-4/+6
| | |\ \ | | | |/
| | | * Bug #38691: segfault/abort in ``UPDATE ...JOIN'' whileGleb Shchepa2008-10-081-4/+6
| * | | merged 5.1-bugteam -> bug 34773 treeGeorgi Kodinov2008-10-101-46/+80
| |\ \ \
| | * \ \ merge 5.1-bugteam -> bug 32124 5.1 treeGeorgi Kodinov2008-10-081-3/+6
| | |\ \ \ | | | |/ /
| | | * | Bug #37348: Crash in or immediately after JOIN::make_sum_func_listGeorgi Kodinov2008-10-021-0/+1
| | | * | MergeRamil Kalimullin2008-10-021-3/+5
| | | |\ \ | | | | |/
| | | | * Fix for bug#39182: Binary log producing incompatible character set queryRamil Kalimullin2008-10-011-3/+5
| | * | | Bug #32124: crash if prepared statements refer to variables in the where clauseGeorgi Kodinov2008-10-081-17/+29
| | |/ /
| | * | merge of bug 39353 5.0-5.1.29-rc -> 5.1-5.1.29-rcGeorgi Kodinov2008-09-191-1/+6
| | |\ \ | | | |/
| | | * Bug #39353: Multiple conditions on timestamp column crashes serverGeorgi Kodinov2008-09-181-1/+6
| * | | Bug#34773: query with explain extended and derived table / other table Georgi Kodinov2008-10-061-2/+2
* | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-28/+90
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#36086: Auto merge.Martin Hansson2008-09-081-10/+2
| |\ \ \
| | * | | Bug#36086: SELECT * from views don't check column grantsMartin Hansson2008-09-031-10/+2
| * | | | merge 5.0 --> 5.1Gleb Shchepa2008-09-031-0/+7
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | merge with local treeGleb Shchepa2008-09-031-0/+7
| | |\ \
| | | * | Bug #39002: The server crashes on the query:Gleb Shchepa2008-09-031-0/+7
| * | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-08-201-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Bug#38291 memory corruption and server crash with view/sp/functionSergey Glukhov2008-08-201-0/+4