summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-5/+775
|\
| * merge Windows performance patches into 5.3Vladislav Vaintroub2011-07-051-3/+3
| |\
| | * Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-3/+3
| * | various fixes for buildbot failuresSergei Golubchik2011-06-101-1/+1
| * | merge with 5.1-microSergei Golubchik2011-06-071-40/+22
| |\ \
| * \ \ Merge with 5.1-microsecondsMichael Widenius2011-05-281-6/+14
| |\ \ \ | | |/ /
| | * | many changes to my_getsystime.c:Sergei Golubchik2011-05-191-2/+5
| * | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+775
| |\ \ \
| | * | | Fixed all reported bugs for dynamic columns.Michael Widenius2011-05-111-2/+13
| | * | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+764
| * | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-37/+91
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge with MariaDB 5.1Michael Widenius2011-05-031-37/+91
| | |\ \
| | | * \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-37/+91
| | | |\ \
| * | | | | Fix LP BUG#715738unknown2011-03-241-0/+1
| |/ / / /
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+7
| | |\ \ \ | | | | |/ | | | |/|
| * | | | merge with 5.1Michael Widenius2010-11-301-0/+43
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-0/+43
| | |\ \ \
* | | | | | 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
| |\ \ \