summaryrefslogtreecommitdiff
path: root/extra/yassl/src
Commit message (Expand)AuthorAgeFilesLines
* mergeSergei Golubchik2012-04-071-1/+4
|\
| * mysql-5.1.62 mergeSergei Golubchik2012-04-0511-141/+248
| |\
* | \ mysql-5.5.22 mergeSergei Golubchik2012-03-2811-126/+222
|\ \ \
| * \ \ Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.Joerg Bruehe2012-03-022-3/+22
| |\ \ \ | | | |/ | | |/|
| | * | Further upgrade the yaSSL library to version 2.2.0Joerg Bruehe2012-03-022-3/+22
| * | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-1311-123/+202
| |\ \ \
| | * \ \ merge from 5.0-securityGeorgi Kodinov2012-02-1311-123/+202
| | |\ \ \ | | | |/ /
| | | * | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1011-124/+203
| | | * | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-107-114/+259
| | * | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-109-18/+26
* | | | | 5.3 mergeSergei Golubchik2012-01-134-4/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-218-32/+28
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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-039-9/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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-309-9/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-308-32/+30
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Updated/added copyright headersKent Boortz2011-06-306-6/+12
* | | | | | fixes for windowsSergei Golubchik2011-10-211-1/+1
* | | | | | merge with 5.3Sergei Golubchik2011-10-192-1/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | typo (in the yassl error message) fixedSergei Golubchik2011-03-011-1/+1
| * | | | | fixes for solaris 10Sergei Golubchik2011-01-261-0/+3
| * | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-4/+0
* | | | | | 5.5-mergeSergei Golubchik2011-07-024-10/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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-292-1/+16
| |\ \ \ \ | | |/ / /
| | * | | MergeKent Boortz2010-12-293-1/+31
| | |\ \ \ | | | | |/ | | | |/|
| | | * | - Added/updated copyright headersKent Boortz2010-12-283-1/+31
| * | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-8/+0
* | | | | merge.Sergei Golubchik2010-11-253-5/+7
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-16/+8
| |\ \ \ | | |/ /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-022-3/+3
| |\ \ \
| * \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-2/+2
| |\ \ \ \
| * \ \ \ \ Changed version number from RC to stableMichael Widenius2010-01-291-1/+1
| |\ \ \ \ \
| * | | | | | Fixed compiler warning messageMichael Widenius2009-10-261-1/+5
| * | | | | | Post-merge fixesSergey Petrunya2009-09-152-3/+2
| * | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-153-4/+4
| |\ \ \ \ \ \
| | * | | | | | Fix most Compiler warnings seen in buildbot.unknown2009-09-033-4/+7
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-16/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-16/+8
* | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-2/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-082-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /