summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.22 mergeSergei Golubchik2012-03-2895-811/+2020
|\
| * Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.Joerg Bruehe2012-03-027-17/+67
| |\
| | * Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.Joerg Bruehe2012-03-027-17/+67
| | |\
| | | * Further upgrade the yaSSL library to version 2.2.0Joerg Bruehe2012-03-027-17/+67
| * | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-1394-797/+1958
| |\ \ \ | | |/ /
| | * | merge from 5.0-securityGeorgi Kodinov2012-02-1395-796/+1955
| | |\ \ | | | |/
| | | * Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1095-797/+1956
| | | * Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1026-260/+372
| | * | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1031-134/+93
* | | | Remove libevent from sources - not needed nowVladislav Vaintroub2012-02-2740-18726/+0
* | | | 5.3 mergeSergei Golubchik2012-01-1322-23/+26
|\ \ \ \
| * \ \ \ Merge with 5.2.Michael Widenius2011-12-1138-141/+177
| |\ \ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-2438-141/+177
| | |\ \ \ \
| | | * \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2138-141/+177
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | when freeing a possibly NULL pointer under safemalloc - use MY_ALLOW_ZERO_PTRSergei Golubchik2011-10-111-1/+1
* | | | | | | Fix LPBUG# : allow chain certificate files to work.Vladislav Vaintroub2011-12-271-3/+3
* | | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-121-0/+2
* | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+3
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0340-55/+74
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-08-221-7/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | 2nd fix for Bug #55713 innochecksum is NOT built with large file support ena...unknown2011-08-171-1/+0
| | * | | | | fix for bug 55713 innochecksum is NOT built with large file support enabledunknown2011-08-161-6/+1
| | * | | | | Updated/added copyright headersKent Boortz2011-07-035-17/+44
| | |\ \ \ \ \
| * | \ \ \ \ \ Updated/added copyright headersKent Boortz2011-07-044-8/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-06-291-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge mysql-5.0 -> mysql-5.1Vasil Dimov2011-06-291-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #12696083 FIX OUTDATED COPYRIGHT NOTICES IN INNODB RELATED CLIENT TOOLSVasil Dimov2011-06-291-1/+1
| | * | | | | | | | This patch is for 5.5.Guilhem Bichot2011-06-071-3/+6
| | * | | | | | | | Merge from mysql-5.1 to mysql-5.5Jon Olav Hauglid2011-06-171-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO Jon Olav Hauglid2011-06-171-1/+1
| * | | | | | | | | Updated/added copyright headersKent Boortz2011-06-3039-46/+68
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Updated/added copyright headersKent Boortz2011-06-3038-130/+137
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-3013-15/+30
| | | | |/ / / / | | | |/| | | |
* | | | | | | | fixes for windowsSergei Golubchik2011-10-211-1/+1
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-1917-83/+135
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix comp_errr crash ( fprintf crashes wheb uninitialized string is passed)Vladislav Vaintroub2011-05-211-0/+1
| * | | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-211-11/+73
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-8/+8
| * | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-032-2/+31
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-2/+31
| | |\ \ \ \ \
| * | | | | | | CMake fixes for buildbot/MSI package building and signing:Vladislav Vaintroub2011-03-281-10/+16
| * | | | | | | Merge with base 5.2Michael Widenius2011-03-231-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-181-1/+1
| * | | | | | | | merge 5.2Vladislav Vaintroub2011-03-107-5/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Automatic merge with 5.2 to fix compiler failure on FreeBSDMichael Widenius2011-03-041-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | typo (in the yassl error message) fixedSergei Golubchik2011-03-011-1/+1
| | * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-286-4/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixed compiler warningsMichael Widenius2011-02-252-3/+3
| | | * | | | | | fixes for solaris 10Sergei Golubchik2011-01-263-0/+11
| | | * | | | | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-1/+1
View Lorry Controller Status