summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-54/+52
|\
| * Fix for compiler warnings:Davi Arnaut2010-01-281-3/+3
| * Bug#49491: Much overhead for MD5() and SHA1() on short stringsDavi Arnaut2010-01-261-15/+16
| * Bug #50096: CONCAT_WS inside procedure returning wrong dataGleb Shchepa2010-01-131-2/+2
| * Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0Davi Arnaut2009-12-041-37/+34
* | Merge with MySQL 5.1.42Michael Widenius2010-01-151-2/+3
|\ \ | |/
| * BUG#47995: Mark system functions as unsafeSven Sandberg2009-11-181-2/+3
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+6
|\ \ | |/
| * 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-09-101-1/+6
| |\
| | * Bug#46815 CONCAT_WS returning wrong dataSergey Glukhov2009-09-101-1/+6
| | * Automerge.Alexey Kopytov2009-06-011-6/+8
| | |\
* | | \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-18/+45
|\ \ \ \ | |/ / /
| * | | Bug#45168: assertion with convert() and empty set valueMartin Hansson2009-06-161-3/+2
| * | | Automerge.Alexey Kopytov2009-06-011-6/+8
| |\ \ \
| | * \ \ Manual merge.Alexey Kopytov2009-06-011-6/+8
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug #44767: invalid memory reads in password() and Alexey Kopytov2009-05-271-6/+8
| * | | | Automerge.Alexey Kopytov2009-05-211-1/+15
| |\ \ \ \
| | * \ \ \ Automerge.Alexey Kopytov2009-05-211-1/+15
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Bug #44796: valgrind: too many my_longlong10_to_str_8bit Alexey Kopytov2009-05-201-1/+15
| | | |/
| * | | Fix for bug#44743: Join in combination with concat does not always workRamil Kalimullin2009-05-211-1/+8
| |/ /
| * | Auto-merge.Ramil Kalimullin2009-05-131-2/+2
| |\ \ | | |/
| | * Fix for bug#44774: load_file function produces valgrind warningsRamil Kalimullin2009-05-121-2/+2
| * | Bug#44365 valgrind warnings with encrypt() functionSergey Glukhov2009-04-231-2/+2
| * | Bug#44358 valgrind errors with decode() functionSergey Glukhov2009-04-231-2/+2
| * | merged bug 35087 to 5.1-bugteamGeorgi Kodinov2009-04-171-4/+8
| |\ \ | | |/
| | * Bug #35087: Inserting duplicate values at one time with DES_ENCRYPT leads Georgi Kodinov2009-04-171-4/+8
| | * auto-mergeIgnacio Galarza2009-03-191-4/+1
| | |\
* | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-3/+3
* | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-7/+7
|\ \ \ \ | |/ / /
| * | | auto-mergeIgnacio Galarza2009-03-171-4/+1
| |\ \ \
| * \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-7/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-7/+7
* | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-4/+1
|\ \ \ \ \
| * \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-4/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge of bug 42434 to 5.1-bugteamGeorgi Kodinov2009-03-111-4/+1
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Bug #42434: license of mysys MD5 implementation is not GPL-compatibleGeorgi Kodinov2009-03-091-4/+1
| | | |/
| * | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-3/+10
| |\ \ \ | | |/ /
* | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-3/+10
|\ \ \ \ | | |/ / | |/| |
| * | | merged 41437 to 5.1-bugteamGeorgi Kodinov2009-01-091-0/+6
| |\ \ \ | | | |/ | | |/|
| | * | Bug #41437: Value stored in 'case' lacks charset, causes segfaultGeorgi Kodinov2009-01-091-0/+6
| * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-091-3/+4
| |\ \ \ | | |/ /
* | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1
| |_|/ |/| |
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+6
|\ \ \ | |/ /
| * | merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-07-111-1/+1
| |\ \ | | |/
| | * warning eliminationGleb Shchepa2008-07-111-1/+1
| * | merge 5.0-bugteam -> 5.1-bugteamGleb Shchepa2008-07-111-1/+1
| |\ \ | | |/
| | * warning eliminationGleb Shchepa2008-07-111-1/+1
| * | Bug#35848: UUID() returns UUIDs with the wrong timeTatiana A. Nurnberg2008-07-101-12/+53
| |\ \ | | |/
| | * Bug#35848: UUID() returns UUIDs with the wrong timeTatiana A. Nurnberg2008-07-101-12/+53
| * | Merge host.loc:/work/bugs/5.0-bugteam-36488unknown2008-05-161-0/+6
| |\ \ | | |/