summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-1/+0
* 5.5-mergeSergei Golubchik2011-07-021-52/+190
|\
| * Merge from 5.1.Guilhem Bichot2011-05-211-4/+4
| |\
| | * Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-4/+4
| * | Preliminary patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-061-1/+1
| * | Bug#11926811 / Bug#60625 Illegal mix of collationsAlexander Barkov2011-04-081-3/+4
| * | Merging from mysql-5.1Alexander Barkov2011-03-031-3/+59
| |\ \ | | |/
| | * Bug 11766519 - 59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FA...Alexander Barkov2011-03-031-3/+59
| * | Merging from 5.1Alexander Barkov2011-03-031-0/+2
| |\ \ | | |/
| | * BUG#11766519 (bug#59648): MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0...Alexander Barkov2011-03-031-0/+2
| * | Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-101-7/+7
| * | Merging from 5.1.Alexander Barkov2011-01-171-9/+3
| |\ \ | | |/
| | * Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string ...Alexander Barkov2011-01-171-9/+3
| * | Merge of fix for Bug#58165.Martin Hansson2011-01-131-22/+23
| |\ \ | | |/
| | * Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-22/+23
| * | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-161-1/+7
| |\ \
| | * \ Merging from mysql-5.1-securityAlexander Barkov2010-11-111-1/+7
| | |\ \ | | | |/
| | | * Bug#57257 Replace(ExtractValue(...)) causes MySQL crashAlexander Barkov2010-11-111-1/+7
| | * | mergeGeorgi Kodinov2010-10-291-2/+3
| | |\ \
| | * \ \ Merge.Ramil Kalimullin2010-10-131-0/+42
| | |\ \ \ | | | | |/ | | | |/|
| * | | | mergeGeorgi Kodinov2010-11-261-0/+35
| |\ \ \ \
| | * | | | Bug#57737 Character sets: search fails with like, contraction, indexAlexander Barkov2010-11-261-0/+35
| | | |_|/ | | |/| |
| * | | | mergeGeorgi Kodinov2010-11-261-0/+42
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fix for bug#57283: inet_ntoa() crashesRamil Kalimullin2010-10-121-0/+1
| | * | Fix for bug#57272: crash in rpad() when using utf8Ramil Kalimullin2010-10-121-0/+42
| * | | Bug#57209 valgrind + Assertion failed: dst > bufTor Didriksen2010-10-081-2/+3
| | |/ | |/|
* | | lots of post-merge changesSergei Golubchik2011-04-251-2/+2
* | | merge.Sergei Golubchik2010-11-251-151/+13
|\ \ \ | |/ / |/| |
| * | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
| * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+1
| |\ \ | | |/
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+1
| |\ \
| * \ \ Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-54/+52
| |\ \ \
| * \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-151-2/+3
| |\ \ \ \
| * \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-18/+45
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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 mysql.com:/home/my/mysql-5.1unknown2008-04-281-16/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Windows fixesunknown2008-01-101-104/+6
| * | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-4/+4
* | | | | | | | | | | | | | | | Bug#55912 FORMAT with locale set fails for numbers < 1000Alexander Barkov2010-08-201-4/+11