summaryrefslogtreecommitdiff
path: root/strings
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| * | | | Fixed compiler errorsMichael Widenius2012-08-141-2/+7
* | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-16/+15
* | | | | Fixed build failures found by buildbotMichael Widenius2012-06-051-1/+1
* | | | | Added text for errno in error messages by:Michael Widenius2012-05-301-42/+143
|/ / / /
* | | | mergeSergei Golubchik2012-04-072-2/+2
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-053-7/+250
| |\ \ \ | | |/ /
| | * | mergeSergei Golubchik2012-04-053-7/+250
| | |\ \ | | | |/
| | | * mysql-5.1.62 mergeSergei Golubchik2012-04-053-7/+250
| | | |\
| * | | | Backport some simple performance patches from 5.5.unknown2012-03-221-4/+9
* | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-284-9/+7
|\ \ \ \ \
| * \ \ \ \ Updated/added copyright headersMySQL Build Team2012-02-164-4/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2012-02-153-4/+3
| | |\ \ \ \
| | | * | | | Updated/added copyright headersMySQL Build Team2012-02-151-2/+1
* | | | | | | Few simple performance fixes found with sysbench oltp.lua and Oprofile:unknown2012-03-211-4/+9
* | | | | | | MDEV-15 Log all SQL errors.Alexey Botchkov2012-03-141-0/+19
* | | | | | | merge with mysql-5.5.21Sergei Golubchik2012-03-093-13/+280
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#13359121 LARGE NUMBERS, /STRINGS/DTOA.C:662Tor Didriksen2012-01-251-13/+36
| * | | | | | Merging Bug#11752408 from mysql-5.1Alexander Barkov2012-01-232-0/+244
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8...Alexander Barkov2012-01-232-0/+244
| * | | | | | merge 5.1-security => 5.5-securityTor Didriksen2011-10-141-8/+13
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | MDEV-135: work-around a GCC bug seen on Debian 5 "lenny" 64-bit.unknown2012-02-061-0/+4
* | | | | | | 5.3 mergeSergei Golubchik2012-01-1332-48/+69
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with 5.2.Michael Widenius2011-12-1142-154/+189
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-2442-154/+189
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-8/+13
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | merge 5.0-security => 5.1 securityTor Didriksen2011-10-141-8/+13
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >...Tor Didriksen2011-10-141-8/+13
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2142-146/+176
| | | |\ \ \ \ | | | | |/ / /
* | | | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i...Michael Widenius2011-12-271-4/+4
* | | | | | | mergeSergei Golubchik2011-11-033-22/+22
|\ \ \ \ \ \ \
| * | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-023-22/+22
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0332-106/+141
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | mergeDaniel Fischer2011-09-231-5/+9
| |\ \ \ \ \ \
| | * | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-211-5/+9
| * | | | | | | merge from 5.5.16Daniel Fischer2011-09-211-9/+45
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Manual merge from mysql-5.5.Ramil Kalimullin2011-08-091-1/+3
| | |\ \ \ \ \ \
| | * | | | | | | Bug #12319710: INVALID MEMORY READ AND/OR CRASH IN MY_UCA_CHARCMP Georgi Kodinov2011-07-221-9/+45
| * | | | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-201-2/+5
| * | | | | | | | merge 5.1 => 5.5Tor Didriksen2011-08-291-1/+8
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS...Tor Didriksen2011-08-291-1/+8
| | * | | | | | Updated/added copyright headersKent Boortz2011-07-032-3/+9
| | |\ \ \ \ \ \