summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2185-436/+871
|\
| * 5.5 mergeSergei Golubchik2014-05-0985-436/+871
| |\
| | * mysql-5.5.37 selective mergeSergei Golubchik2014-03-2785-427/+866
| | |\
| | | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-1757-0/+57
| | | * Bug#14211271 ISSUES WITH SSL ON DEBIAN WHEEZY I386 AND KFREEBSD-I386Anirudh Mangipudi2014-02-0615-183/+294
| | | * Bug#16715064 MYSQL COMMUNITY UTILITIES CANNOT CONNECT TO MYSQL ENTERPRISEAnirudh Mangipudi2014-01-0816-237/+514
* | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-2/+2
|\ \ \ \ | |/ / /
| * | | Merge with 10.0-baseMichael Widenius2014-03-131-2/+2
| |\ \ \
| | * \ \ Merge with 5.5Michael Widenius2014-03-111-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fixed a compiler failure and removed some warnings in windowsMichael Widenius2014-03-111-2/+2
* | | | | Merged revision 3471, 3472 & 3473 from maria-5.5-galera.Nirbhay Choubey2014-03-281-3/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merged revision 3471, 3472 & 3473 from maria-5.5-galera.Nirbhay Choubey2014-03-271-3/+8
* | | | | 10.0-base mergeSergei Golubchik2014-02-267-7/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 5.5 mergeSergei Golubchik2014-02-257-7/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MySQL-5.5.36 mergeSergei Golubchik2014-02-177-7/+7
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Updated/added copyright headersMurthy Narkedimilli2014-01-067-7/+7
* | | | | Automatic mergeMichael Widenius2014-02-056-39/+90
|\ \ \ \ \
| * | | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-026-39/+90
| | |_|_|/ | |/| | |
* | | | | 10.0-base mergeSergei Golubchik2014-02-032-0/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-012-0/+10
| |\ \ \ | | |/ /
| | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-222-0/+10
| | |\ \ | | | |/
| | | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR...Sreedhar.S2013-10-092-0/+10
* | | | 10.0-base mergeSergei Golubchik2013-12-161-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-1/+1
| |\ \ \ | | |/ /
| | * | Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
* | | | 10.0-base merge.Sergei Golubchik2013-09-21101-2/+45845
|\ \ \ \ | |/ / /
| * | | 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
* | | | | 10.0-monty mergeSergei Golubchik2013-07-212-4/+9
|\ \ \ \ \
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-262-5/+8
* | | | | | 10.0-base mergeSergei Golubchik2013-07-189-11/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | 10.0-base mergeSergei Golubchik2013-06-0671-103/+320
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | 10.0-base mergeSergei Golubchik2013-04-152-18/+38
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
View Lorry Controller Status