summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-18101-2/+45845
|\
| * merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-10100-0/+45843
| |\
| | * merge in git://github.com/Tokutek/jemallocSergei Golubchik2013-08-29100-0/+45843
| * | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error...Sergei Golubchik2013-09-091-1/+0
| * | mysql-5.5.33 mergeSergei Golubchik2013-09-061-2/+2
| |\ \ | | |/ | |/|
| | * Merge from mysql-5.1 to mysql-5.5Jon Olav Hauglid2013-05-161-1/+19
| | |\
| | | * Bug#16807394: PREVENT NEW ERROR MESSAGES FROM BEING ADDED TO 5.5Jon Olav Hauglid2013-05-161-1/+19
| | | * Correcting the permissions of executable files.Murthy Narkedimilli2013-03-206-0/+0
| | | * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1917-19/+19
* | | | 5.5 mergeSergei Golubchik2013-07-179-11/+11
|\ \ \ \ | |/ / /
| * | | mysql-5.5.32 mergeSergei Golubchik2013-07-169-11/+11
| |\ \ \ | | |/ /
| | * | Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-206-0/+0
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-199-11/+11
* | | | 5.5 mergeSergei Golubchik2013-06-0671-105/+320
|\ \ \ \ | |/ / /
| * | | mysql-5.5.31 mergeSergei Golubchik2013-05-0773-107/+323
| |\ \ \ | | |/ /
| | * | Updated/added copyright headersMurthy Narkedimilli2013-02-2672-84/+74
| | |\ \ | | | |/
| | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-2577-89/+77
| | * | Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THEHarin Vadodaria2013-02-155-25/+215
| | |\ \ | | | |/
| | | * Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN: BREAKING THEHarin Vadodaria2013-02-155-25/+215
* | | | 5.5 mergeSergei Golubchik2013-03-272-18/+38
|\ \ \ \ | |/ / /
| * | | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-17/+31
| * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-1/+7
| |\ \ \ | | |/ /
| | * | Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTIONHarin Vadodaria2012-12-131-1/+7
| | |\ \ | | | |/
| | | * Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTIONHarin Vadodaria2012-12-131-1/+7
| | | * Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1Harin Vadodaria2012-11-2116-35/+74
* | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-232-3/+3
* | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-233-5/+5
* | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-3/+0
|\ \ \ \ | |/ / /
| * | | Fixed some compiler warningsMichael Widenius2012-12-191-3/+0
* | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-178-252/+0
* | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-1619-77/+84
|\ \ \ \ | |/ / /
| * | | 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+1
| |\ \ \
| | * \ \ Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-094-41/+5
| | |\ \ \
| | | * \ \ Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-084-41/+5
| | | |\ \ \
| | | | * \ \ Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-064-41/+5
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| * | | | | | 5.3 mergeSergei Golubchik2012-10-181-2/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergeSergei Golubchik2012-09-271-2/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge from 5.1unknown2012-09-271-2/+6
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain...unknown2012-09-271-2/+6
| | * | | | | 5.2 merge.Sergei Golubchik2012-08-221-0/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.1 mergeSergei Golubchik2012-08-221-0/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+4
| | | | |\ \ \
| * | | | \ \ \ mysql-5.5.28Sergei Golubchik2012-10-1618-74/+77
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | * | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-2/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-2/+3
| | * | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-071-37/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-072-38/+1
| | | | |_|_|/ | | | |/| | |
| | * | | | | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22Harin Vadodaria2012-07-2416-35/+74
View Lorry Controller Status