summaryrefslogtreecommitdiff
path: root/extra/yassl
Commit message (Expand)AuthorAgeFilesLines
* mergeSergei Golubchik2012-04-071-1/+4
|\
| * mysql-5.1.62 mergemariadb-5.1.62Sergei Golubchik2012-04-0599-941/+2110
| |\
* | \ 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.mysql-5.5.22Joerg Bruehe2012-03-027-17/+67
| |\ \ \ | | | |/ | | |/|
| | * | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.mysql-5.1.62Joerg Bruehe2012-03-027-17/+67
| | |\ \
| | | * | Further upgrade the yaSSL library to version 2.2.0mysql-5.0.96Joerg 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
* | | | | 5.3 mergeSergei Golubchik2012-01-1314-14/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2130-112/+136
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-07-032-6/+4
| | |\ \ \
* | | | | | Fix LPBUG# : allow chain certificate files to work.Vladislav Vaintroub2011-12-271-3/+3
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0332-32/+46
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-07-041-3/+2
| |\ \ \ \ \
| | * \ \ \ \ 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-3032-32/+47
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-3030-114/+104
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Updated/added copyright headersKent Boortz2011-06-3011-11/+22
* | | | | | fixes for windowsSergei Golubchik2011-10-211-1/+1
* | | | | | merge with 5.3Sergei Golubchik2011-10-196-40/+15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | typo (in the yassl error message) fixedSergei Golubchik2011-03-011-1/+1
| * | | | | Fixed compiler warningsMichael Widenius2011-02-252-3/+3
| * | | | | fixes for solaris 10Sergei Golubchik2011-01-263-0/+11
| * | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-297-24/+0
* | | | | | 5.5-mergeSergei Golubchik2011-07-0246-51/+634
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge from mysql5.1 for bug#11760210Mayank Prasad2011-03-111-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LI...Mayank Prasad2011-03-111-1/+1
| | | |/ / | | |/| |
| * | | | MergeKent Boortz2010-12-2938-2/+633
| |\ \ \ \ | | |/ / /
| | * | | MergeKent Boortz2010-12-2947-4/+740
| | |\ \ \ | | | | |/ | | | |/|
| | | * | - Added/updated copyright headersKent Boortz2010-12-2847-4/+740
| * | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-207-48/+0
* | | | | merge.Sergei Golubchik2010-11-259-10/+24
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-278-53/+54
| |\ \ \ | | |/ /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-0215-62/+73
| |\ \ \
| * \ \ \ Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46unknown2010-04-283-3/+3
| |\ \ \ \
| * | | | | Fix a bunch of Windows warningsBo Thorsen2010-04-211-1/+0
| * | | | | Merge MySQL 5.1.44 into MariaDB.mariadb-merge-mysql-5.1.44unknown2010-03-041-46/+42
| |\ \ \ \ \
| * \ \ \ \ \ Changed version number from RC to stableMichael Widenius2010-01-291-1/+1
| |\ \ \ \ \ \
| * | | | | | | YaSSL cert info buffer overflow fixSergei Golubchik2010-01-272-49/+67
| * | | | | | | Fix some compiler warnings.unknown2009-12-061-1/+2
| * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-162-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Added federatedx storage engineMichael Widenius2009-10-301-0/+2
| * | | | | | | Fixed compiler warning messageMichael Widenius2009-10-264-1/+11
| * | | | | | | Post-merge fixesSergey Petrunya2009-09-154-6/+5
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-156-8/+8
| |\ \ \ \ \ \ \