summaryrefslogtreecommitdiff
path: root/strings
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4786 merge 10.0-monty > 10.0Alexander Barkov2013-08-021-0/+12
* 10.0-monty mergeSergei Golubchik2013-07-2114-62/+205
|\
| * Fix compiler warning - using "const" twice for CHARSET_INFO.Vladislav Vaintroub2013-07-131-4/+4
| * Fixed some wrong format strings.Michael Widenius2013-06-281-3/+5
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-2614-59/+200
* | 10.0-base mergeSergei Golubchik2013-07-186-9/+9
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-176-9/+9
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-166-9/+9
| | |\ \
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-196-9/+9
* | | | | 10.0-base mergeSergei Golubchik2013-06-067-40/+122
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-06-067-40/+122
| |\ \ \ \ | | |/ / /
| | * | | mysql-5.5.31 mergeSergei Golubchik2013-05-077-41/+123
| | |\ \ \ | | | |/ /
| | | * | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONINGMattias Jonsson2013-01-301-2/+2
| | | |\ \
| | | * \ \ BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-146-42/+123
| | | |\ \ \ | | | | |/ /
| | | | * | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-146-40/+124
* | | | | | 10.0-base mergeSergei Golubchik2013-04-155-57/+55
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-04-142-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3 mergeSergei Golubchik2013-04-121-2/+6
| | |\ \ \ \
| | | * \ \ \ 5.2 mergeSergei Golubchik2013-04-111-2/+6
| | | |\ \ \ \
| | | | * \ \ \ 5.1 mergeSergei Golubchik2013-04-111-2/+6
| | | | |\ \ \ \
| | | | | * | | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-061-2/+6
| | * | | | | | | MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-281-1/+1
| * | | | | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-073-12/+12
| * | | | | | | | 5.5 mergeSergei Golubchik2013-03-271-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 5.3->5.5 mergeSergei Golubchik2013-03-101-1/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | MDEV-4241 fix.unknown2013-03-061-1/+3
| | | * | | | | | MDEV-4020 : Make sure strmov symbol is exported by client library on Linux (...Vladislav Vaintroub2013-01-111-6/+0
| | * | | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-0/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Bug#15960005 VALGRIND WARNINGS IN PROCESS_ARGSTor Didriksen2012-12-101-0/+2
| | | * | | | | | Bug#11754279 SIGNIFICANT INACCURACY IN DECIMAL MULTIPLICATION CALCULATIONSTor Didriksen2012-11-291-16/+17
| | | * | | | | | mergeGeorgi Kodinov2012-07-051-0/+4
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |Georgi Kodinov2012-07-051-0/+4
| | | * | | | | | Bug#14039955 RPAD FUNCTION LEADS TO UNINITIALIZED VALUES WARNING IN MY_STRTODTor Didriksen2012-05-181-5/+12
| * | | | | | | | Performance improvements in "from latin1" and "to utf8" conversion.Alexander Barkov2013-03-122-41/+33
* | | | | | | | | Merging utf16le from MySQL-5.6Alexander Barkov2013-03-282-131/+395
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 10.0-base mergeSergei Golubchik2013-01-312-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-01-291-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed compiler warningMichael Widenius2013-01-171-1/+2
| * | | | | | | main.partition_myisam crashes in embedded.Sergei Golubchik2013-01-231-3/+4
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ...Sergei Golubchik2012-11-171-1/+1
* | | | | | | | correct truncation in my_vsnprintf %M formatSergei Golubchik2012-10-251-22/+24
|/ / / / / / /
* | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-10-041-0/+1
* | | | | | | Automatic merge with 5.5Michael Widenius2012-09-012-5/+55
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge from 5.3unknown2012-08-241-2/+47
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge from 5.2unknown2012-08-241-0/+64
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge from 5.1.unknown2012-08-241-0/+63
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-3/+126