summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.5Sergei Golubchik2012-11-0319-76/+83
|\
| * 5.3 mergeSergei Golubchik2012-10-181-2/+6
| |\
| | * mergeSergei Golubchik2012-09-271-2/+6
| | |\
| | | * Merge from 5.1unknown2012-09-271-2/+6
| | | |\
| | | | * Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain...unknown2012-09-271-2/+6
| | * | | 5.2 merge.Sergei Golubchik2012-08-221-0/+4
| | |\ \ \ | | | |/ /
| | | * | 5.1 mergeSergei Golubchik2012-08-221-0/+4
| | | |\ \ | | | | |/
| | | | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+4
| | | | |\
| * | | | \ mysql-5.5.28Sergei Golubchik2012-10-1618-74/+77
| |\ \ \ \ \
| | * \ \ \ \ Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | |\ \ \ \ \
| | | * | | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | * | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-2/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-2/+3
| | * | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-071-37/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-072-38/+1
| | | | |_|_|/ | | | |/| | |
| | * | | | | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22Harin Vadodaria2012-07-2416-35/+74
* | | | | | | disable x86 asm version of taocrypt arc4 code for gcc,Sergei Golubchik2012-10-301-0/+4
* | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-193-4/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Automatic merge with 5.5Michael Widenius2012-09-013-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed compiler warningsMichael Widenius2012-08-171-1/+1
| | * | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | merge 5.1->5.5Georgi Kodinov2012-05-151-0/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug #11761822: yassl rejects valid certificate which openssl acceptsGeorgi Kodinov2012-05-151-0/+4
| | * | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-3/+1
* | | | | | | | Fixing test casesMichael Widenius2012-08-232-3/+17
* | | | | | | | More fixesMichael Widenius2012-08-171-3/+3
* | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-1413-93/+251
|/ / / / / / /
* | | | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-3/+2
* | | | | | | Merge with 5.5Michael Widenius2012-05-311-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-2/+2
* | | | | | | Added text for errno in error messages by:Michael Widenius2012-05-301-2/+2
|/ / / / / /
* | | | | | Fixed some simple warnings on Windows.Vladislav Vaintroub2012-04-131-3/+3
* | | | | | mergeSergei Golubchik2012-04-071-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergeSergei Golubchik2012-04-0599-941/+2110
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mergeSergei Golubchik2012-04-0599-941/+2110
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-0599-941/+2110
| | | |\ \ \ | | | | | |/ | | | | |/|
| * | | | | mergeSergei Golubchik2012-03-301-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | mergeSergei Golubchik2012-03-301-1/+1
| | |\ \ \ \
| | | * | | | mdev-205 don't install libevent headersSergei Golubchik2012-03-301-1/+1
| | | |/ / /
* | | | | | 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
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |