summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* merge 5.1->5.5Georgi Kodinov2012-05-151-0/+4
|\
| * Bug #11761822: yassl rejects valid certificate which openssl acceptsGeorgi Kodinov2012-05-151-0/+4
* | 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
* | | 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...hery.ramilison@oracle.com2011-08-171-1/+0
| * | fix for bug 55713 innochecksum is NOT built with large file support enabledhery.ramilison@oracle.com2011-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
| | | |/ | | |/|
* | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-061-8/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-8/+10
| * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-281-1/+30
* | | | Bug#11933945 REMOVE LGPL LICENSED FILES IN MYSQL 5.5Magne Mahre2011-03-291-1/+33
* | | | 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
| |/ /
* | | Bug #11766729 59906: 5.5 DEBUG BUILDS BROKEN BY EXTRA/COMP_ERR.CTor Didriksen2011-02-161-2/+1
* | | BUG#57953 my_load_defaults return junk argument ----args-separator---- to callerHe Zhenxing2011-01-171-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-208-105/+0
* | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-163-7/+6
|\ \ \
| * | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-123-7/+6
* | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-044-7/+14
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-292-18/+8
| |\ \ \
| * | | | Cleanup after bild team push.Vladislav Vaintroub2010-07-252-2/+11
| * | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+3
| * | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-2/+0
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-291-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Bug#53463: YaSSL patch appears to be revertedDavi Arnaut2010-07-281-1/+1
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-18/+8
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-18/+8
* | | Manual merge from mysql-trunk.Alexander Nozdrin2010-07-192-1/+2
|\ \ \
| * | | CMakeLists.txtKent Boortz2010-06-232-1/+2
* | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-1512-127/+30
|\ \ \ \